diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-02-05 16:08:00 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-06 02:33:33 +0100 |
| commit | 4a37e2977cb24713fd36d04ec97e97adc2aaba87 (patch) | |
| tree | 8b5f54671e7b07b55073fec1f230711141f7219e /libavcodec | |
| parent | 927696aab258c7184ceac9765a305b5f91eef8dc (diff) | |
| download | ffmpeg-4a37e2977cb24713fd36d04ec97e97adc2aaba87.tar.gz | |
libfdk-aacenc: disable hard version requirements
Enable compilation on machines with an old libfdk-aac.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libfdk-aacenc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index 2d91e58558..bc70400898 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -151,6 +151,9 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) case 4: mode = MODE_1_2_1; sce = 2; cpe = 1; break; case 5: mode = MODE_1_2_2; sce = 1; cpe = 2; break; case 6: mode = MODE_1_2_2_1; sce = 2; cpe = 2; break; +/* The version macro is introduced the same time as the 7.1 support, so this + should suffice. */ +#ifdef AACENCODER_LIB_VL0 case 8: sce = 2; cpe = 3; @@ -161,6 +164,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) mode = MODE_7_1_FRONT_CENTER; } break; +#endif default: av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels %d\n", avctx->channels); @@ -394,8 +398,10 @@ static const uint64_t aac_channel_layout[] = { AV_CH_LAYOUT_4POINT0, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, +#ifdef AACENCODER_LIB_VL0 AV_CH_LAYOUT_7POINT1_WIDE_BACK, AV_CH_LAYOUT_7POINT1, +#endif 0, }; |