diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 17:47:30 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 17:47:34 +0400 |
| commit | 06f7e87e15a6dd15a9fe0e1f0bfa9f72c8886475 (patch) | |
| tree | fca6c8fb313f159d1ee757e80e772bf5a6010ca1 | |
| parent | 420f63984b39dbc847295126ee2e701df068dd53 (diff) | |
| parent | 80c268eaaee402695a74d14acf76063100692a99 (diff) | |
Merge commit '80c268eaaee402695a74d14acf76063100692a99' into release/1.1
* commit '80c268eaaee402695a74d14acf76063100692a99':
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 25ed1bf3b7..54d39db37a 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -357,11 +357,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) |