RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36' 

* commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36':
  cdgraphics: do not return 0 from the decode function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-07 01:56:28 +02:00
parent 91b4ed0918 c7d9b473e2
commit c628627995
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/cdgraphics.c
View File

@ -353,10 +353,9 @@ static int cdg_decode_frame(AVCodecContext *avctx,
*got_frame = 1; *got_frame = 1;
} else { } else {
*got_frame = 0; *got_frame = 0;
buf_size = 0;
} }
return buf_size; return avpkt->size;
} }
static av_cold int cdg_decode_end(AVCodecContext *avctx) static av_cold int cdg_decode_end(AVCodecContext *avctx)