diff options
| author | James Almer <jamrial@gmail.com> | 2023-06-24 14:37:10 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2023-06-24 14:43:46 -0300 |
| commit | 3f345ebf215d96c03683373faa0414996da4d258 (patch) | |
| tree | dcfec38f9631d146b493950560673231815ed975 | |
| parent | 868af7d7a406b13648c7dff9fc8c4a7221e86849 (diff) | |
| download | ffmpeg-release/6.0.tar.gz | |
avcodec/aac_ac3_parser: add preprocessor checks for codec specific coderelease/6.0
Should fix ticket #10421.
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 35af1695a9ad6f950e03efd156b99898b94dd57c)
| -rw-r--r-- | libavcodec/aac_ac3_parser.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 9ab979632d..83d515b5a8 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -95,6 +95,7 @@ get_next: duration in seconds is still correct (as is the number of bits in the frame). */ if (avctx->codec_id != AV_CODEC_ID_AAC) { +#if CONFIG_AC3_PARSER AC3HeaderInfo hdr, *phrd = &hdr; int offset = ff_ac3_find_syncword(buf, buf_size); @@ -146,7 +147,9 @@ FF_ENABLE_DEPRECATION_WARNINGS if (hdr.bitstream_mode == 0x7 && hdr.channels > 1) avctx->audio_service_type = AV_AUDIO_SERVICE_TYPE_KARAOKE; bit_rate = hdr.bit_rate; +#endif } else { +#if CONFIG_AAC_PARSER AACADTSHeaderInfo hdr, *phrd = &hdr; int ret = avpriv_adts_header_parse(&phrd, buf, buf_size); @@ -154,6 +157,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return i; bit_rate = hdr.bit_rate; +#endif } /* Calculate the average bit rate */ |