Merge commit 'b146d74730ab9ec5abede9066f770ad851e45fbc'

[ffmpeg] / libavformat / gif.c

diff --git a/libavformat/gif.c b/libavformat/gif.c
index 9cc4c9a2f69bfd5c9e2d7614ff4097a490e3af10..2cff81a493ff025683eca4bf3038f8cd2bd25250 100644 (file)
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -347,7 +347,7 @@ static int gif_write_trailer(AVFormatContext *s)
     AVIOContext *pb = s->pb;
 
     avio_w8(pb, 0x3b);
-    avio_flush(s->pb);
+
     return 0;
 }
 
@@ -355,7 +355,7 @@ static int gif_write_trailer(AVFormatContext *s)
 #define ENC AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
     { "loop", "Number of times to loop the output.", OFFSET(loop),
-      AV_OPT_TYPE_INT, { 0 }, 0, 65535, ENC },
+      AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 65535, ENC },
     { NULL },
 };
 
@@ -372,8 +372,8 @@ AVOutputFormat ff_gif_muxer = {
     .mime_type      = "image/gif",
     .extensions     = "gif",
     .priv_data_size = sizeof(GIFContext),
-    .audio_codec    = CODEC_ID_NONE,
-    .video_codec    = CODEC_ID_RAWVIDEO,
+    .audio_codec    = AV_CODEC_ID_NONE,
+    .video_codec    = AV_CODEC_ID_RAWVIDEO,
     .write_header   = gif_write_header,
     .write_packet   = gif_write_packet,
     .write_trailer  = gif_write_trailer,