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/eamad.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/eamad.c')
| -rw-r--r-- | libavcodec/eamad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 25316172a1..7012c4ef12 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -227,7 +227,7 @@ static void calc_quant_matrix(MadContext *s, int qscale) } static int decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -240,7 +240,7 @@ static int decode_frame(AVCodecContext *avctx, if (buf_size < 26) { av_log(avctx, AV_LOG_ERROR, "Input buffer too small\n"); - *data_size = 0; + *got_frame = 0; return AVERROR_INVALIDDATA; } @@ -288,7 +288,7 @@ static int decode_frame(AVCodecContext *avctx, if(decode_mb(s, inter) < 0) return AVERROR_INVALIDDATA; - *data_size = sizeof(AVFrame); + *got_frame = 1; *(AVFrame*)data = s->frame; if (chunk_type != MADe_TAG) |