mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-11 09:57:54 +02:00
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>
This commit is contained in:
commit
242b3c292a
@ -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,
|
||||
};
|
||||
|
@ -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, \
|
||||
|
Loading…
Reference in New Issue
Block a user