diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 01:56:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 01:56:50 +0200 |
| commit | c62862799575e720b02cf640429da598d43d8b07 (patch) | |
| tree | b823add36516d87df605a3743ff5f432eee97a40 /libavcodec | |
| parent | 91b4ed09180c358f950ccbed4d3774178357add6 (diff) | |
| parent | c7d9b473e28238d4a4ef1b7e8b42c1cca256da36 (diff) | |
| download | ffmpeg-streaming-c62862799575e720b02cf640429da598d43d8b07.zip ffmpeg-streaming-c62862799575e720b02cf640429da598d43d8b07.tar.gz | |
Merge commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36'
* commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36':
cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 69a2cb2..340df44 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) |
