Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Feb 2014 01:18:58 +0000 (02:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Feb 2014 01:18:58 +0000 (02:18 +0100)
* commit '9cd4bc41760f8ad879e248920eacbe1e7757152c':
  ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/ac3dec.c
libavcodec/eac3dec.c
libavcodec/version.h

Simple merge
Simple merge
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 34
 -#define LIBAVCODEC_VERSION_MICRO  1
 +#define LIBAVCODEC_VERSION_MINOR  52
- #define LIBAVCODEC_VERSION_MICRO 101
++#define LIBAVCODEC_VERSION_MICRO 102
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \