har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avutil/frame: use av_buffer_replace() to simplify code

Browse Source 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Gil Pedersen <git@gpost.dk>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Gil Pedersen 2020-11-18 13:05:17 +00:00 committed by James Almer
parent abcca6a055
commit 2b6b19dd9b
1 changed files with 9 additions and 22 deletions

31
libavutil/frame.c

@ -349,7 +349,7 @@ int av_frame_get_buffer(AVFrame *frame, int align)
static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy)
{ {
int i; int ret, i;
dst->key_frame = src->key_frame; dst->key_frame = src->key_frame;
dst->pict_type = src->pict_type; dst->pict_type = src->pict_type;
@ -426,31 +426,18 @@ FF_DISABLE_DEPRECATION_WARNINGS
dst->qscale_table = NULL; dst->qscale_table = NULL;
dst->qstride = 0; dst->qstride = 0;
dst->qscale_type = 0; dst->qscale_type = 0;
av_buffer_unref(&dst->qp_table_buf); av_buffer_replace(&dst->qp_table_buf, src->qp_table_buf);
if (src->qp_table_buf) { if (dst->qp_table_buf) {
dst->qp_table_buf = av_buffer_ref(src->qp_table_buf); dst->qscale_table = dst->qp_table_buf->data;
if (dst->qp_table_buf) { dst->qstride = src->qstride;
dst->qscale_table = dst->qp_table_buf->data; dst->qscale_type = src->qscale_type;
dst->qstride = src->qstride;
dst->qscale_type = src->qscale_type;
}
} }
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
av_buffer_unref(&dst->opaque_ref); ret = av_buffer_replace(&dst->opaque_ref, src->opaque_ref);
av_buffer_unref(&dst->private_ref); ret |= av_buffer_replace(&dst->private_ref, src->private_ref);
if (src->opaque_ref) { return ret;
dst->opaque_ref = av_buffer_ref(src->opaque_ref);
if (!dst->opaque_ref)
return AVERROR(ENOMEM);
}
if (src->private_ref) {
dst->private_ref = av_buffer_ref(src->private_ref);
if (!dst->private_ref)
return AVERROR(ENOMEM);
}
return 0;
} }
int av_frame_ref(AVFrame *dst, const AVFrame *src) int av_frame_ref(AVFrame *dst, const AVFrame *src)