Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / swfdec.c

diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index f90564f3db38991f8b09d355a2cb7976a5f90dea..d399cc3a5d76ef5b34d6b47ddb89e2316c699543 100644 (file)
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -204,14 +204,13 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
     skip:
         avio_skip(pb, len);
     }
-    return 0;
 }
 
 AVInputFormat ff_swf_demuxer = {
-    "swf",
-    NULL_IF_CONFIG_SMALL("Flash format"),
-    sizeof(SWFContext),
-    swf_probe,
-    swf_read_header,
-    swf_read_packet,
+    .name           = "swf",
+    .long_name      = NULL_IF_CONFIG_SMALL("Flash format"),
+    .priv_data_size = sizeof(SWFContext),
+    .read_probe     = swf_probe,
+    .read_header    = swf_read_header,
+    .read_packet    = swf_read_packet,
 };