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>

1 files changed, 4 insertions, 4 deletions

diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c
index acd9b29146..06b673b66f 100644
--- a/libavcodec/gifdec.c
+++ b/libavcodec/gifdec.c
@@ -415,7 +415,7 @@ static int gif_read_header1(GifState *s)
 static int gif_parse_next_image(GifState *s, int *got_picture)
 {
     int ret;
-    *got_picture = sizeof(AVPicture);
+    *got_picture = 1;
     while (s->bytestream < s->bytestream_end) {
         int code = bytestream_get_byte(&s->bytestream);
 
@@ -454,7 +454,7 @@ static av_cold int gif_decode_init(AVCodecContext *avctx)
     return 0;
 }
 
-static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_picture, AVPacket *avpkt)
+static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt)
 {
     const uint8_t *buf = avpkt->data;
     int buf_size = avpkt->size;
@@ -505,10 +505,10 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_picture,
         s->picture.key_frame = 0;
     }
 
-    ret = gif_parse_next_image(s, got_picture);
+    ret = gif_parse_next_image(s, got_frame);
     if (ret < 0)
         return ret;
-    else if (*got_picture)
+    else if (*got_frame)
         *picture = s->picture;
 
     return s->bytestream - buf;