diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 15:09:00 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 15:09:00 +0100 |
| commit | 6586f62d1a7cbb14e449eb077b057dec6a64f23a (patch) | |
| tree | 958d7bcc9815e512d536861be9df2c5a4e04bdf0 | |
| parent | 3dec7ed3cf04985ae68b64c3b05ecf559f493518 (diff) | |
| parent | 3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc (diff) | |
| download | ffmpeg-6586f62d1a7cbb14e449eb077b057dec6a64f23a.tar.gz | |
Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc'
* commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc':
lavf: add a missing bump and APIchanges for the codecpar switch
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index e02097b1a7..cc73528792 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 d3408eb968..3575c5ac3f 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, \ |