Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / sol.c

diff --git a/libavformat/sol.c b/libavformat/sol.c
index 7ad894e304abbf36d4a76ef97dcabed939bf6ca6..895623392c7b900a0dc68a573aa895895204f98b 100644 (file)
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -85,7 +85,6 @@ static int sol_channels(int magic, int type)
 static int sol_read_header(AVFormatContext *s,
                           AVFormatParameters *ap)
 {
-    int size;
     unsigned int magic,tag;
     AVIOContext *pb = s->pb;
     unsigned int id, channels, rate, type;
@@ -99,7 +98,7 @@ static int sol_read_header(AVFormatContext *s,
         return -1;
     rate = avio_rl16(pb);
     type = avio_r8(pb);
-    size = avio_rl32(pb);
+    avio_skip(pb, 4); /* size */
     if (magic != 0x0B8D)
         avio_r8(pb); /* newer SOLs contain padding byte */
 
@@ -142,12 +141,10 @@ static int sol_read_packet(AVFormatContext *s,
 }
 
 AVInputFormat ff_sol_demuxer = {
-    "sol",
-    NULL_IF_CONFIG_SMALL("Sierra SOL format"),
-    0,
-    sol_probe,
-    sol_read_header,
-    sol_read_packet,
-    NULL,
-    pcm_read_seek,
+    .name           = "sol",
+    .long_name      = NULL_IF_CONFIG_SMALL("Sierra SOL format"),
+    .read_probe     = sol_probe,
+    .read_header    = sol_read_header,
+    .read_packet    = sol_read_packet,
+    .read_seek      = pcm_read_seek,
 };