virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-13 21:26:33 +02:00
Code Issues Releases Activity

avcodec/avcodec: Actually honour the documentation of subtitle_header

Browse Source 
It is only supposed to be freed by libavcodec for decoders, yet
avcodec_open2() always frees it on failure.
Furthermore, avcodec_close() doesn't free it for decoders.
Both of this has been changed.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-04-18 05:26:32 +02:00
parent 878e45e0fb
commit a1ed984e04
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/avcodec.c
View File

@ -418,7 +418,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_dict_free(&tmp); av_dict_free(&tmp);
av_freep(&avctx->priv_data); av_freep(&avctx->priv_data);
av_freep(&avctx->subtitle_header); if (av_codec_is_decoder(avctx->codec))
av_freep(&avctx->subtitle_header);
#if FF_API_OLD_ENCDEC #if FF_API_OLD_ENCDEC
av_frame_free(&avci->to_free); av_frame_free(&avci->to_free);
@ -589,7 +590,9 @@ FF_DISABLE_DEPRECATION_WARNINGS
av_frame_free(&avctx->coded_frame); av_frame_free(&avctx->coded_frame);
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
} } else if (av_codec_is_decoder(avctx->codec))
av_freep(&avctx->subtitle_header);
avctx->codec = NULL; avctx->codec = NULL;
avctx->active_thread_type = 0; avctx->active_thread_type = 0;