ffmpeg | branch: release/1.2 | Anton Khirnov <an...@khirnov.net> | Wed Aug 6
10:56:34 2014 +0000| [f712d3669e2eed4a57b0e4d85d2902a2036de89e] | 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-sta...@libav.org
(cherry picked from commit c7d9b473e28238d4a4ef1b7e8b42c1cca256da36)
Conflicts:
libavcodec/cdgraphics.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f712d3669e2eed4a57b0e4d85d2902a2036de89e
---
libavcodec/cdgraphics.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c
index 94ce6ae..7405ba5 100644
--- a/libavcodec/cdgraphics.c
+++ b/libavcodec/cdgraphics.c
@@ -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)
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
