diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 20:15:57 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-05 20:20:19 +0400 |
| commit | fc1152de410323cf41dedd0bf301a6a265b0850f (patch) | |
| tree | 38341f1e990ea51bf52fa2f3474cdc7757fefd0f /libavcodec/libvpxdec.c | |
| parent | 022553e875094565417d32b82975f56be8384820 (diff) | |
| parent | df9b9567518f2840d79a4a96b447ebe1aa326408 (diff) | |
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/libvpxdec.c')
| -rw-r--r-- | libavcodec/libvpxdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index 61dbaa7998..809266a982 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -59,7 +59,7 @@ static av_cold int vp8_init(AVCodecContext *avctx) } static int vp8_decode(AVCodecContext *avctx, - void *data, int *data_size, AVPacket *avpkt) + void *data, int *got_frame, AVPacket *avpkt) { VP8Context *ctx = avctx->priv_data; AVFrame *picture = data; @@ -100,7 +100,7 @@ static int vp8_decode(AVCodecContext *avctx, picture->linesize[1] = img->stride[1]; picture->linesize[2] = img->stride[2]; picture->linesize[3] = 0; - *data_size = sizeof(AVPicture); + *got_frame = 1; } return avpkt->size; } |