cdgraphics: do not return 0 from the decode function
authorAnton Khirnov <anton@khirnov.net>
Wed, 6 Aug 2014 10:56:34 +0000 (10:56 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 00:05:19 +0000 (02:05 +0200)
0 means no data consumed, so it can trigger an infinite loop in the
caller.

CC:libav-stable@libav.org
(cherry picked from commit c7d9b473e28238d4a4ef1b7e8b42c1cca256da36)

Conflicts:

libavcodec/cdgraphics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cdgraphics.c

index 94ce6ae..7405ba5 100644 (file)
@@ -361,11 +361,10 @@ static int cdg_decode_frame(AVCodecContext *avctx,
         *got_frame = 1;
     } else {
         *got_frame = 0;
-        buf_size   = 0;
     }
 
     *(AVFrame *) data = cc->frame;
-    return buf_size;
+    return avpkt->size;
 }
 
 static av_cold int cdg_decode_end(AVCodecContext *avctx)