| Message ID | 1527502497-2417-1-git-send-email-hwrenx@126.com |
|---|---|
| State | New |
| Headers | show |
On Mon, May 28, 2018 at 18:14:55 +0800, hwren wrote: > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -705,6 +705,7 @@ extern AVCodec ff_libx264_encoder; > extern AVCodec ff_libx264rgb_encoder; > extern AVCodec ff_libx265_encoder; > extern AVCodec ff_libxavs_encoder; > +extern AVCodec ff_libdavs2_decoder; > extern AVCodec ff_libxvid_encoder; Does this work without patch 2? (I didn't test.) > @@ -689,6 +690,7 @@ enum AVCodecID { > * stream (only used by libavformat) */ > AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. > AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket > + > }; Why? Please omit this change. > #define LIBAVCODEC_VERSION_MAJOR 58 > -#define LIBAVCODEC_VERSION_MINOR 19 > +#define LIBAVCODEC_VERSION_MINOR 20 > #define LIBAVCODEC_VERSION_MICRO 102 If you increase minor, you also need to reset micro to 100. Moritz
On Mon, May 28, 2018 at 06:14:55PM +0800, hwren wrote: > Signed-off-by: hwren <hwrenx@126.com> > --- > doc/APIchanges | 3 +++ > libavcodec/allcodecs.c | 1 + > libavcodec/avcodec.h | 2 ++ > libavcodec/version.h | 2 +- > libavformat/riff.c | 1 + non cosmetic patches should generally not change more than one lib [...]
diff --git a/doc/APIchanges b/doc/APIchanges index efe15ba..430a914 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-05-xx - xxxxxxxxxx - lavc 58.20.102 - 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/allcodecs.c b/libavcodec/allcodecs.c index 7b7a8c7..6103081 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -705,6 +705,7 @@ extern AVCodec ff_libx264_encoder; extern AVCodec ff_libx264rgb_encoder; extern AVCodec ff_libx265_encoder; extern AVCodec ff_libxavs_encoder; +extern AVCodec ff_libdavs2_decoder; extern AVCodec ff_libxvid_encoder; extern AVCodec ff_libzvbi_teletext_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fb0c6fa..a0dd2ce 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, @@ -689,6 +690,7 @@ enum AVCodecID { * stream (only used by libavformat) */ AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket + }; /** diff --git a/libavcodec/version.h b/libavcodec/version.h index da893da..219f56c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 19 +#define LIBAVCODEC_VERSION_MINOR 20 #define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavformat/riff.c b/libavformat/riff.c index 8911725..4153372 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -369,6 +369,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') }, { AV_CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') }, { AV_CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') }, + { AV_CODEC_ID_AVS2, MKTAG('A', 'V', 'S', '2') }, { AV_CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, { AV_CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') }, { AV_CODEC_ID_JPEG2000, MKTAG('L', 'J', '2', 'C') },
Signed-off-by: hwren <hwrenx@126.com> --- doc/APIchanges | 3 +++ libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 2 ++ libavcodec/version.h | 2 +- libavformat/riff.c | 1 + 5 files changed, 8 insertions(+), 1 deletion(-)