aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/sunrast.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-05 17:15:57 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-05 17:20:19 +0100
commitfc1152de410323cf41dedd0bf301a6a265b0850f (patch)
tree38341f1e990ea51bf52fa2f3474cdc7757fefd0f /libavcodec/sunrast.c
parent022553e875094565417d32b82975f56be8384820 (diff)
parentdf9b9567518f2840d79a4a96b447ebe1aa326408 (diff)
downloadffmpeg-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/sunrast.c')
-rw-r--r--libavcodec/sunrast.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
index f85bb96844..bfdf2b7e2a 100644
--- a/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@ -40,7 +40,8 @@ static av_cold int sunrast_init(AVCodecContext *avctx) {
}
static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
- int *data_size, AVPacket *avpkt) {
+ int *got_frame, AVPacket *avpkt)
+{
const uint8_t *buf = avpkt->data;
const uint8_t *buf_end = avpkt->data + avpkt->size;
SUNRASTContext * const s = avctx->priv_data;
@@ -222,7 +223,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
}
*picture = s->picture;
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
return buf - bufstart;
}