[SCM] libav/experimental: libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d
Author: Omer Osman <omer.osman at iis.fraunhofer.de>
Date:   Mon Jul 7 10:28:12 2014 +0200

    libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream
    
    For implicit signaling cases (as possible for Spectral Band Replication
    and Parametric Stereo Tools), the decoder must decode the first frame to
    correctly identify the stream configuration (as called from
    avformat_find_stream_info). The mechanism for this is built-in and only
    requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec
    struct.
    
    Signed-off-by: Omer Osman <omer.osman at iis.fraunhofer.de>
    Signed-off-by: Martin Storsjö <martin at martin.st>

diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c
index 2a975b0..27e5712 100644
--- a/libavcodec/libfdk-aacdec.c
+++ b/libavcodec/libfdk-aacdec.c
@@ -298,6 +298,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 05a2250..82601b5 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 55
 #define LIBAVCODEC_VERSION_MINOR 55
-#define LIBAVCODEC_VERSION_MICRO  1
+#define LIBAVCODEC_VERSION_MICRO  2
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \

-- 
Libav/FFmpeg packaging