[FFmpeg-cvslog] avcodec/wcmv: Avoid copying frames if they are unchanged

Michael Niedermayer git at videolan.org
Mon Feb 25 19:04:50 EET 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Feb 19 19:05:10 2019 +0100| [976dae8b32f48d17cccfd6b19d2beb01770dfa7c] | committer: Michael Niedermayer

avcodec/wcmv: Avoid copying frames if they are unchanged

Improves speed of the testcase by about a factor of 10

Fixes: Timeout
Fixes: 13132/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5664190616829952

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/wcmv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/wcmv.c b/libavcodec/wcmv.c
index f03761b343..2988c15b23 100644
--- a/libavcodec/wcmv.c
+++ b/libavcodec/wcmv.c
@@ -56,11 +56,13 @@ static int decode_frame(AVCodecContext *avctx,
     }
 
     bytestream2_init(&gb, avpkt->data, avpkt->size);
+    blocks = bytestream2_get_le16(&gb);
+    if (!blocks)
+        return avpkt->size;
 
     if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
         return ret;
 
-    blocks = bytestream2_get_le16(&gb);
     if (blocks > 5) {
         GetByteContext bgb;
         int x = 0, size;



More information about the ffmpeg-cvslog mailing list