RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-31 20:02:42 +00:00
Code Issues Projects Releases Wiki Activity

avformat/demux: ensure ch_layout is not lost in the stream's internal avctx

Browse Source 
This is a workaround until avcodec_close() stops freeing ch_layout through
av_opt_fre(), or the former is removed.

Fixes a regression since 327efa6633.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-03-21 08:48:19 -03:00
parent 505a7d39cd
commit 37f4440682
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/demux.c
View File

@ -2957,6 +2957,9 @@ find_stream_info_err:
av_freep(&sti->info);
}
avcodec_close(sti->avctx);
// FIXME: avcodec_close() frees AVOption settable fields which includes ch_layout,
// so we need to restore it.
av_channel_layout_copy(&sti->avctx->ch_layout, &st->codecpar->ch_layout);
av_bsf_free(&sti->extract_extradata.bsf);
}
if (ic->pb) {