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/svq3.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/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index e19542252c..c50efbc70f 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1008,7 +1008,7 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) } static int svq3_decode_frame(AVCodecContext *avctx, void *data, - int *data_size, AVPacket *avpkt) + int *got_frame, AVPacket *avpkt) { SVQ3Context *svq3 = avctx->priv_data; H264Context *h = &svq3->h; @@ -1022,7 +1022,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, if (s->next_picture_ptr && !s->low_delay) { *(AVFrame *) data = s->next_picture.f; s->next_picture_ptr = NULL; - *data_size = sizeof(AVFrame); + *got_frame = 1; } return 0; } @@ -1167,7 +1167,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data, /* Do not output the last pic after seeking. */ if (s->last_picture_ptr || s->low_delay) - *data_size = sizeof(AVFrame); + *got_frame = 1; return buf_size; } |