diff options
| author | Omer Osman <omer.osman@iis.fraunhofer.de> | 2014-07-07 10:28:12 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-07-07 22:09:15 +0300 |
| commit | 1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d (patch) | |
| tree | cbbf69543ed1d7bbbe5e6e818089acd944508675 | |
| parent | a863c97e99bf30a88baa74f83bab9e3ab25984dc (diff) | |
| download | ffmpeg-1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d.tar.gz | |
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@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/libfdk-aacdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index 2a975b0ff4..27e5712096 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 05a2250da2..82601b568a 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, \ |