Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:45:21 +0000 (13:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:45:21 +0000 (13:45 +0200)
* commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909':
  vdpau: deprecate old codec-specific pixel formats

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/APIchanges
libavutil/old_pix_fmts.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

diff --cc doc/APIchanges
Simple merge
Simple merge
Simple merge
Simple merge
index dafbeffca0bdb559cb877df63b33b13c570eb9fd,c760d8d75059e058e7ccc20c26b1058d2464d176..6eafda680d70da08648f51aac1c267faced27f0e
@@@ -74,9 -36,9 +74,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 52
 -#define LIBAVUTIL_VERSION_MINOR 14
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#define LIBAVUTIL_VERSION_MAJOR  52
- #define LIBAVUTIL_VERSION_MINOR  40
++#define LIBAVUTIL_VERSION_MINOR  41
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \