virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc: handle hw_frames_ctx where necessary

Browse Source 
avcodec_copy_context() didn't handle hw_frames_ctx references correctly
which could cause crashes.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Andrey Turkin
2016-05-25 14:16:14 +03:00
committed by Anton Khirnov
parent 4024b566d6
commit 24b5cff01b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/options.c
View File

@@ -190,6 +190,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
dest->inter_matrix = NULL; dest->inter_matrix = NULL;
dest->rc_override = NULL; dest->rc_override = NULL;
dest->subtitle_header = NULL; dest->subtitle_header = NULL;
dest->hw_frames_ctx = NULL;
#if FF_API_MPV_OPT #if FF_API_MPV_OPT
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
dest->rc_eq = NULL; dest->rc_eq = NULL;
@@ -219,13 +220,21 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
dest->subtitle_header_size = src->subtitle_header_size; dest->subtitle_header_size = src->subtitle_header_size;
#undef alloc_and_copy_or_fail #undef alloc_and_copy_or_fail
if (src->hw_frames_ctx) {
dest->hw_frames_ctx = av_buffer_ref(src->hw_frames_ctx);
if (!dest->hw_frames_ctx)
goto fail;
}
return 0; return 0;
fail: fail:
av_freep(&dest->subtitle_header);
av_freep(&dest->rc_override); av_freep(&dest->rc_override);
av_freep(&dest->intra_matrix); av_freep(&dest->intra_matrix);
av_freep(&dest->inter_matrix); av_freep(&dest->inter_matrix);
av_freep(&dest->extradata); av_freep(&dest->extradata);
av_buffer_unref(&dest->hw_frames_ctx);
#if FF_API_MPV_OPT #if FF_API_MPV_OPT
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
av_freep(&dest->rc_eq); av_freep(&dest->rc_eq);