aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-07 23:16:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-07 23:16:59 +0200
commit242b3c292a49cc620fae6554ab74e748392d9197 (patch)
treeb946515645d5a175fca30ace4208bfafa36c0aa7
parent75be508f7c6ed946170eab3323f6749f84dbb8b8 (diff)
parent1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d (diff)
downloadffmpeg-242b3c292a49cc620fae6554ab74e748392d9197.tar.gz
Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'
* 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>
-rw-r--r--libavcodec/libfdk-aacdec.c2
-rw-r--r--libavcodec/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
index 376dd39556..624d57959c 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -294,6 +294,6 @@ AVCodec ff_libfdk_aac_decoder = {
.decode = fdk_aac_decode_frame,
.close = fdk_aac_decode_close,
.flush = fdk_aac_decode_flush,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = CODEC_CAP_DR1 | CODEC_CAP_CHANNEL_CONF,
.priv_class = &fdk_aac_dec_class,
};
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 25530ed465..fedc35728e 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55
#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, \