Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / oma.c

diff --git a/libavformat/oma.c b/libavformat/oma.c
index 633f0995c6b1e96724519363f613f68974435c08..1ab30688c6d658bfdc4d39a76c307df9e430912e 100644 (file)
--- a/libavformat/oma.c
+++ b/libavformat/oma.c
@@ -192,14 +192,12 @@ static int oma_read_probe(AVProbeData *p)
 
 
 AVInputFormat ff_oma_demuxer = {
-    "oma",
-    NULL_IF_CONFIG_SMALL("Sony OpenMG audio"),
-    0,
-    oma_read_probe,
-    oma_read_header,
-    oma_read_packet,
-    0,
-    pcm_read_seek,
+    .name           = "oma",
+    .long_name      = NULL_IF_CONFIG_SMALL("Sony OpenMG audio"),
+    .read_probe     = oma_read_probe,
+    .read_header    = oma_read_header,
+    .read_packet    = oma_read_packet,
+    .read_seek      = pcm_read_seek,
     .flags= AVFMT_GENERIC_INDEX,
     .extensions = "oma,aa3",
     .codec_tag= (const AVCodecTag* const []){codec_oma_tags, 0},