har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/isom: don't drop the known layout when parsing AAC decSpecificInfo

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-04-02 20:21:13 -03:00
parent d157725cf7
commit 50458b7fa1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/isom.c
View File

@ -359,9 +359,11 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext
st->codecpar->extradata_size, 1, fc); st->codecpar->extradata_size, 1, fc);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (cfg.channels != st->codecpar->ch_layout.nb_channels) {
av_channel_layout_uninit(&st->codecpar->ch_layout); av_channel_layout_uninit(&st->codecpar->ch_layout);
st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
st->codecpar->ch_layout.nb_channels = cfg.channels; st->codecpar->ch_layout.nb_channels = cfg.channels;
}
if (cfg.object_type == 29 && cfg.sampling_index < 3) // old mp3on4 if (cfg.object_type == 29 && cfg.sampling_index < 3) // old mp3on4
st->codecpar->sample_rate = ff_mpa_freq_tab[cfg.sampling_index]; st->codecpar->sample_rate = ff_mpa_freq_tab[cfg.sampling_index];
else if (cfg.ext_sample_rate) else if (cfg.ext_sample_rate)