Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / g723_1.c

diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c
index 86ef540edf604b5efb66e532211353cfd5fdc364..a12a47a1ae777d1472988a4bcdd049d53ed9d890 100644 (file)
--- a/libavformat/g723_1.c
+++ b/libavformat/g723_1.c
@@ -29,7 +29,7 @@
 
 static const uint8_t frame_size[4] = {24, 20, 4, 1};
 
-static int g723_1_init(AVFormatContext *s, AVFormatParameters *ap)
+static int g723_1_init(AVFormatContext *s)
 {
     AVStream *st;
 
@@ -73,12 +73,10 @@ static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt)
 }
 
 AVInputFormat ff_g723_1_demuxer = {
-    "g723_1",
-    NULL_IF_CONFIG_SMALL("G.723.1 format"),
-    0,
-    NULL,
-    g723_1_init,
-    g723_1_read_packet,
+    .name        = "g723_1",
+    .long_name   = NULL_IF_CONFIG_SMALL("G.723.1 format"),
+    .read_header = g723_1_init,
+    .read_packet = g723_1_read_packet,
     .extensions = "tco,rco",
     .flags = AVFMT_GENERIC_INDEX
 };