[SCM] libav/experimental: use designated initializer in ASS (de)muxer

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 87d69d323204e69e49abaa1e0e9033296cb2a539
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Sat Dec 4 00:37:53 2010 +0000

    use designated initializer in ASS (de)muxer
    
    Originally committed as revision 25868 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 9f03b88..ffce157 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -203,12 +203,12 @@ static int read_seek2(AVFormatContext *s, int stream_index,
 }
 
 AVInputFormat ass_demuxer = {
-    "ass",
-    NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
-    sizeof(ASSContext),
-    probe,
-    read_header,
-    read_packet,
-    read_close,
-    .read_seek2  = read_seek2,
+    .name           = "ass",
+    .long_name      = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
+    .priv_data_size = sizeof(ASSContext),
+    .read_probe     = probe,
+    .read_header    = read_header,
+    .read_packet    = read_packet,
+    .read_close     = read_close,
+    .read_seek2     = read_seek2,
 };
diff --git a/libavformat/assenc.c b/libavformat/assenc.c
index 9b854ec..9a2f966 100644
--- a/libavformat/assenc.c
+++ b/libavformat/assenc.c
@@ -78,15 +78,13 @@ static int write_trailer(AVFormatContext *s)
 }
 
 AVOutputFormat ass_muxer = {
-    "ass",
-    NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
-    "text/x-ssa",
-    "ass,ssa",
-    sizeof(ASSContext),
-    CODEC_ID_NONE,
-    CODEC_ID_NONE,
-    write_header,
-    write_packet,
-    write_trailer,
+    .name           = "ass",
+    .long_name      = NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
+    .mime_type      = "text/x-ssa",
+    .extensions     = "ass,ssa",
+    .priv_data_size = sizeof(ASSContext),
+    .write_header   = write_header,
+    .write_packet   = write_packet,
+    .write_trailer  = write_trailer,
     .flags = AVFMT_GLOBALHEADER | AVFMT_NOTIMESTAMPS
 };

-- 
Libav/FFmpeg packaging