Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 21:16:59 +0000 (23:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 21:16:59 +0000 (23:16 +0200)
* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
  libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

Conflicts:
libavcodec/version.h

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

Simple merge
index 25530ed46530bcdb0bcde2919489b639e9e4e088,82601b568aa402dd696ddf544b54c5bd0f0dc142..fedc35728ee83819e2a6dced89b115bcb30cfb86
@@@ -29,8 -29,8 +29,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVCODEC_VERSION_MAJOR 55
 -#define LIBAVCODEC_VERSION_MINOR 55
 -#define LIBAVCODEC_VERSION_MICRO  2
 +#define LIBAVCODEC_VERSION_MINOR  68
- #define LIBAVCODEC_VERSION_MICRO 101
++#define LIBAVCODEC_VERSION_MICRO 102
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                 LIBAVCODEC_VERSION_MINOR, \