diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 11:37:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-22 11:42:03 +0200 |
| commit | 85f8a3cb50c3950acc8d9854880cf620c60667a5 (patch) | |
| tree | cf236abea4a3195ce262731a081316e759edeb67 | |
| parent | 8310bccc91168b499ebedbeb8a63099ca3424b0a (diff) | |
| parent | e208e6d209728d332343aa5390ae377ac0a6305c (diff) | |
| download | ffmpeg-85f8a3cb50c3950acc8d9854880cf620c60667a5.tar.gz | |
Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'
* commit 'e208e6d209728d332343aa5390ae377ac0a6305c':
lavu: Add interleaved 4:2:2 8/10-bit formats
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
See: 90ca5a9b5fc3f1484c389a44f40ee1af4b8f435e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 4af936e983..a911536bb8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,10 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-09-21 - xxxxxxx - lavu 52.16.0 - pixfmt.h + Add interleaved 4:2:2 8/10-bit formats AV_PIX_FMT_NV16 and + AV_PIX_FMT_NV20. + 2013-09-16 - c74c3fb / 3feb3d6 - lavu 52.44.100 / 52.15.0 - mem.h Add av_reallocp. diff --git a/libavutil/version.h b/libavutil/version.h index 057e9f1328..cc64e4ab10 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,7 +75,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 45 +#define LIBAVUTIL_VERSION_MINOR 46 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |