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>

1 files changed, 3 insertions, 1 deletions

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 4a0647cc60..b6cee2d886 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -494,7 +494,9 @@ int av_frame_replace(AVFrame *dst, const AVFrame *src)
             || src->data[2] || src->data[3])
             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;