Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:12:41 +0000 (22:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 21:12:41 +0000 (22:12 +0100)
* commit '5b4797a21db900b7d509660b7a4d49829089b004':
  avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/APIchanges
libavcodec/internal.h
libavcodec/utils.c
libavutil/frame.h
libavutil/version.h

diff --cc doc/APIchanges
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -55,9 -53,9 +55,9 @@@
   * @{
   */
  
 -#define LIBAVUTIL_VERSION_MAJOR 53
 -#define LIBAVUTIL_VERSION_MINOR  2
 -#define LIBAVUTIL_VERSION_MICRO  0
 +#define LIBAVUTIL_VERSION_MAJOR  52
- #define LIBAVUTIL_VERSION_MINOR  61
++#define LIBAVUTIL_VERSION_MINOR  62
 +#define LIBAVUTIL_VERSION_MICRO 100
  
  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                 LIBAVUTIL_VERSION_MINOR, \