diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 17:15:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 17:20:19 +0100 |
| commit | fc1152de410323cf41dedd0bf301a6a265b0850f (patch) | |
| tree | 38341f1e990ea51bf52fa2f3474cdc7757fefd0f /libavcodec/kgv1dec.c | |
| parent | 022553e875094565417d32b82975f56be8384820 (diff) | |
| parent | df9b9567518f2840d79a4a96b447ebe1aa326408 (diff) | |
| download | ffmpeg-fc1152de410323cf41dedd0bf301a6a265b0850f.tar.gz | |
Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'
* commit 'df9b9567518f2840d79a4a96b447ebe1aa326408':
lavc: fix decode_frame() third parameter semantics for video decoders
Conflicts:
libavcodec/cscd.c
libavcodec/eamad.c
libavcodec/ffv1dec.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/iff.c
libavcodec/mjpegdec.c
libavcodec/pcx.c
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/kgv1dec.c')
| -rw-r--r-- | libavcodec/kgv1dec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 66829bfae6..0199636822 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -43,7 +43,8 @@ static void decode_flush(AVCodecContext *avctx) avctx->release_buffer(avctx, &c->prev); } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) +static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, + AVPacket *avpkt) { const uint8_t *buf = avpkt->data; const uint8_t *buf_end = buf + avpkt->size; @@ -155,7 +156,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac if (outcnt - maxcnt) av_log(avctx, AV_LOG_DEBUG, "frame finished with %d diff\n", outcnt - maxcnt); - *data_size = sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = c->cur; if (c->prev.data[0]) |