Commit d2c6bcdb authored by James Almer's avatar James Almer

avcodec/options: factorize avcodec_copy_context() cleanup code

Reviewed-by: 's avatarAaron Levinson <alevinsn@aracnet.com>
Tested-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
(cherry picked from commit 54a4c9b4)
parent 7f2eeb2c
...@@ -187,6 +187,19 @@ void avcodec_free_context(AVCodecContext **pavctx) ...@@ -187,6 +187,19 @@ void avcodec_free_context(AVCodecContext **pavctx)
} }
#if FF_API_COPY_CONTEXT #if FF_API_COPY_CONTEXT
static void copy_context_reset(AVCodecContext *avctx)
{
av_opt_free(avctx);
av_freep(&avctx->rc_override);
av_freep(&avctx->intra_matrix);
av_freep(&avctx->inter_matrix);
av_freep(&avctx->extradata);
av_freep(&avctx->subtitle_header);
av_buffer_unref(&avctx->hw_frames_ctx);
avctx->subtitle_header_size = 0;
avctx->extradata_size = 0;
}
int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
{ {
const AVCodec *orig_codec = dest->codec; const AVCodec *orig_codec = dest->codec;
...@@ -199,12 +212,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src) ...@@ -199,12 +212,7 @@ int avcodec_copy_context(AVCodecContext *dest, const AVCodecContext *src)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
av_opt_free(dest); copy_context_reset(dest);
av_freep(&dest->rc_override);
av_freep(&dest->intra_matrix);
av_freep(&dest->inter_matrix);
av_freep(&dest->extradata);
av_freep(&dest->subtitle_header);
memcpy(dest, src, sizeof(*dest)); memcpy(dest, src, sizeof(*dest));
av_opt_copy(dest, src); av_opt_copy(dest, src);
...@@ -263,15 +271,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -263,15 +271,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
fail: fail:
av_freep(&dest->subtitle_header); copy_context_reset(dest);
av_freep(&dest->rc_override);
av_freep(&dest->intra_matrix);
av_freep(&dest->inter_matrix);
av_freep(&dest->extradata);
av_buffer_unref(&dest->hw_frames_ctx);
dest->subtitle_header_size = 0;
dest->extradata_size = 0;
av_opt_free(dest);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment