generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cdgraphics: do not return 0 from the decode function

Browse Source 
0 means no data consumed, so it can trigger an infinite loop in the
caller.

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

Conflicts:

	libavcodec/cdgraphics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov
2014-08-06 10:56:34 +00:00
committed by Michael Niedermayer
parent ca232ff9b0
commit f712d3669e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/cdgraphics.c
View File

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