[FFmpeg-cvslog] cdgraphics: do not return 0 from the decode function
Anton Khirnov
git at videolan.org
Fri Nov 28 20:02:18 CET 2014
ffmpeg | branch: release/2.1 | Anton Khirnov <anton at khirnov.net> | Wed Aug 6 10:56:34 2014 +0000| [f7ed48938a3346e6493fa64bebc7ff242d2c9cfe] | committer: Michael Niedermayer
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
(cherry picked from commit c7d9b473e28238d4a4ef1b7e8b42c1cca256da36)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7ed48938a3346e6493fa64bebc7ff242d2c9cfe
---
libavcodec/cdgraphics.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c
index b7a8fa7..3c07fc7 100644
--- a/libavcodec/cdgraphics.c
+++ b/libavcodec/cdgraphics.c
@@ -353,10 +353,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