mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-28 17:51:05 +00:00
avutil/frame: remove one layer of indirection in av_frame_replace()
And don't force copy side data. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
4f9799bd88
commit
4adb6da7a6
@ -494,7 +494,9 @@ int av_frame_replace(AVFrame *dst, const AVFrame *src)
|
|||||||
|| src->data[2] || src->data[3])
|
|| src->data[2] || src->data[3])
|
||||||
return av_frame_ref(dst, src);
|
return av_frame_ref(dst, src);
|
||||||
|
|
||||||
return av_frame_copy_props(dst, src);
|
ret = frame_copy_props(dst, src, 0);
|
||||||
|
if (ret < 0)
|
||||||
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
dst->format = src->format;
|
dst->format = src->format;
|
||||||
|
Loading…
Reference in New Issue
Block a user