| Message ID | 1530591729-7202-1-git-send-email-hwrenx@126.com |
|---|---|
| State | New |
| Headers | show |
2018-07-03 6:22 GMT+02:00, hwren <hwrenx@126.com>: > Signed-off-by: hwren <hwrenx@126.com> > --- > doc/APIchanges | 3 +++ > libavcodec/avcodec.h | 1 + > libavcodec/codec_desc.c | 7 +++++++ > libavcodec/version.h | 4 ++-- > 4 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/doc/APIchanges b/doc/APIchanges > index efe15ba..3372118 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -15,6 +15,9 @@ libavutil: 2017-10-21 > > API changes, most recent first: > > +2018-07-xx - xxxxxxxxxx - lavc 58.21.100 - avcodec.h > + Add AV_CODEC_ID_AVS2. Looking at the file, this seems unneeded to me. And if nobody requested something else, please merge the actual external decoder into this patch (not the libavformat changes), together with the configure and the doc change. Wait for another review, Carl Eugen
The decoder could not work well without its parser, so I merged the parser-patch into the codec-patch. Thanks for advice, hwrenx. At 2018-07-04 04:24:39, "Carl Eugen Hoyos" <ceffmpeg@gmail.com> wrote: >2018-07-03 6:22 GMT+02:00, hwren <hwrenx@126.com>: >> Signed-off-by: hwren <hwrenx@126.com> >> --- >> doc/APIchanges | 3 +++ >> libavcodec/avcodec.h | 1 + >> libavcodec/codec_desc.c | 7 +++++++ >> libavcodec/version.h | 4 ++-- >> 4 files changed, 13 insertions(+), 2 deletions(-) >> >> diff --git a/doc/APIchanges b/doc/APIchanges >> index efe15ba..3372118 100644 >> --- a/doc/APIchanges >> +++ b/doc/APIchanges >> @@ -15,6 +15,9 @@ libavutil: 2017-10-21 >> >> API changes, most recent first: >> >> +2018-07-xx - xxxxxxxxxx - lavc 58.21.100 - avcodec.h >> + Add AV_CODEC_ID_AVS2. > >Looking at the file, this seems unneeded to me. > >And if nobody requested something else, please merge >the actual external decoder into this patch (not the >libavformat changes), together with the configure and >the doc change. > >Wait for another review, Carl Eugen >_______________________________________________ >ffmpeg-devel mailing list >ffmpeg-devel@ffmpeg.org >http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
diff --git a/doc/APIchanges b/doc/APIchanges index efe15ba..3372118 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-07-xx - xxxxxxxxxx - lavc 58.21.100 - avcodec.h + Add AV_CODEC_ID_AVS2. + 2018-05-xx - xxxxxxxxxx - lavf 58.15.100 - avformat.h Add pmt_version field to AVProgram diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c90166d..1ac9092 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -409,6 +409,7 @@ enum AVCodecID { AV_CODEC_ID_DXV, AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_RSCC, + AV_CODEC_ID_AVS2, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 36e9a9b..c0ed4d4 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1395,6 +1395,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_AVS2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "avs2", + .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"), + .props = AV_CODEC_PROP_LOSSY, + }, + { .id = AV_CODEC_ID_Y41P, .type = AVMEDIA_TYPE_VIDEO, .name = "y41p", diff --git a/libavcodec/version.h b/libavcodec/version.h index 39be9d5..d49317f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 20 -#define LIBAVCODEC_VERSION_MICRO 104 +#define LIBAVCODEC_VERSION_MINOR 21 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \
Signed-off-by: hwren <hwrenx@126.com> --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/version.h | 4 ++-- 4 files changed, 13 insertions(+), 2 deletions(-)