ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Mon Apr 11 15:09:00 2016 +0100| [6586f62d1a7cbb14e449eb077b057dec6a64f23a] | committer: Derek Buitenhuis
Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc' * commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc': lavf: add a missing bump and APIchanges for the codecpar switch Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6586f62d1a7cbb14e449eb077b057dec6a64f23a --- doc/APIchanges | 3 +++ libavformat/version.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index e02097b..cc73528 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-04-11 - xxxxxxx - lavf 57.33.0 - avformat.h + Add AVStream.codecpar, deprecate AVStream.codec. + 2016-04-02 - xxxxxxx - lavu 55.20.100 - base64.h Add AV_BASE64_DECODE_SIZE(x) macro. diff --git a/libavformat/version.h b/libavformat/version.h index d3408eb..3575c5a 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 32 +#define LIBAVFORMAT_VERSION_MINOR 33 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ ====================================================================== diff --cc doc/APIchanges index e02097b,2db39de..cc73528 --- a/doc/APIchanges +++ b/doc/APIchanges @@@ -15,10 -13,10 +15,13 @@@ libavutil: 2015-08-2 API changes, most recent first: -2016-02-23 - 9200514 - lavf 57.5.0 - avformat.h ++2016-04-11 - xxxxxxx - lavf 57.33.0 - avformat.h + Add AVStream.codecpar, deprecate AVStream.codec. + -2016-xx-xx - lavc 57.14.0 - avcodec.h +2016-04-02 - xxxxxxx - lavu 55.20.100 - base64.h + Add AV_BASE64_DECODE_SIZE(x) macro. + +2016-xx-xx - lavc 57.33.0 - avcodec.h xxxxxxx - Add AVCodecParameters and its related API. xxxxxxx - Add av_get_audio_frame_duration2(). diff --cc libavformat/version.h index d3408eb,f264076..3575c5a --- a/libavformat/version.h +++ b/libavformat/version.h @@@ -29,9 -29,9 +29,9 @@@ #include "libavutil/version.h" -#define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 5 -#define LIBAVFORMAT_VERSION_MICRO 0 +#define LIBAVFORMAT_VERSION_MAJOR 57 - #define LIBAVFORMAT_VERSION_MINOR 32 ++#define LIBAVFORMAT_VERSION_MINOR 33 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog