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: 90ca5a9b5f Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 85f8a3cb50
parent 8310bccc91 e208e6d209
commit 85f8a3cb50
2 changed files with 5 additions and 1 deletions
--- 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.

--- 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, \