diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:49:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:49:37 +0200 |
| commit | c11b3010c21a194a9e8da7f07c918ce1276e3d10 (patch) | |
| tree | 87dbd686d1d29edb3361cc22bbc8c5d624a4cf08 | |
| parent | 3301b248b0338ca53ad24ae77677bd733ed9d063 (diff) | |
| parent | 18f48e05a22a73a389fb3ab4b3eaf78903bab5ef (diff) | |
| download | ffmpeg-c11b3010c21a194a9e8da7f07c918ce1276e3d10.tar.gz | |
Merge commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef' into release/2.2
* commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef':
cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/cdgraphics.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 69a2cb2f64..340df44818 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) |