RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '24b5cff01bbac4e08acfd6d19c499e880988f520' 

* commit '24b5cff01bbac4e08acfd6d19c499e880988f520':
  lavc: handle hw_frames_ctx where necessary

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-06-26 15:18:56 +02:00
parent b20fe650ef 24b5cff01b
commit 2c1d0f871f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/options.c
View File

@ -233,6 +233,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
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;
#define alloc_and_copy_or_fail(obj, size, pad) \ #define alloc_and_copy_or_fail(obj, size, pad) \
if (src->obj && size > 0) { \ if (src->obj && size > 0) { \
@ -253,14 +254,21 @@ FF_ENABLE_DEPRECATION_WARNINGS
av_assert0(dest->subtitle_header_size == src->subtitle_header_size); av_assert0(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_freep(&dest->subtitle_header); av_buffer_unref(&dest->hw_frames_ctx);
dest->subtitle_header_size = 0; dest->subtitle_header_size = 0;
dest->extradata_size = 0; dest->extradata_size = 0;
av_opt_free(dest); av_opt_free(dest);