[FFmpeg-cvslog] cdgraphics: do not return 0 from the decode function
Anton Khirnov
git at videolan.org
Thu Aug 7 02:03:50 CEST 2014
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Aug 6 10:56:34 2014 +0000| [c7d9b473e28238d4a4ef1b7e8b42c1cca256da36] | committer: Anton Khirnov
cdgraphics: do not return 0 from the decode function
0 means no data consumed, so it can trigger an infinite loop in the
caller.
CC:libav-stable at libav.org
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7d9b473e28238d4a4ef1b7e8b42c1cca256da36
---
libavcodec/cdgraphics.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c
index 752003f..c3e42e7 100644
--- a/libavcodec/cdgraphics.c
+++ b/libavcodec/cdgraphics.c
@@ -349,10 +349,9 @@ static int cdg_decode_frame(AVCodecContext *avctx,
*got_frame = 1;
} else {
*got_frame = 0;
- buf_size = 0;
}
- return buf_size;
+ return avpkt->size;
}
static av_cold int cdg_decode_end(AVCodecContext *avctx)
More information about the ffmpeg-cvslog
mailing list