[FFmpeg-cvslog] avcodec/wavpack: use av_buffer_replace() to simplify code

Gil Pedersen git at videolan.org
Thu Nov 19 15:13:50 EET 2020


ffmpeg | branch: master | Gil Pedersen <git at gpost.dk> | Wed Nov 18 13:05:16 2020 +0000| [abcca6a055919916fcd199c6e40d5102a3de4a70] | committer: James Almer

avcodec/wavpack: use av_buffer_replace() to simplify code

Reviewed-by: Anton Khirnov <anton at khirnov.net>
Signed-off-by: Gil Pedersen <git at gpost.dk>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abcca6a055919916fcd199c6e40d5102a3de4a70
---

 libavcodec/wavpack.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index f77548e5a5..58122c948c 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -1024,13 +1024,12 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
             return ret;
     }
 
-    av_buffer_unref(&fdst->dsd_ref);
     fdst->dsdctx = NULL;
     fdst->dsd_channels = 0;
+    ret = av_buffer_replace(&fdst->dsd_ref, fsrc->dsd_ref);
+    if (ret < 0)
+        return ret;
     if (fsrc->dsd_ref) {
-        fdst->dsd_ref = av_buffer_ref(fsrc->dsd_ref);
-        if (!fdst->dsd_ref)
-            return AVERROR(ENOMEM);
         fdst->dsdctx = (DSDContext*)fdst->dsd_ref->data;
         fdst->dsd_channels = fsrc->dsd_channels;
     }



More information about the ffmpeg-cvslog mailing list