[FFmpeg-cvslog] r25868 - in trunk/libavformat: assdec.c assenc.c

[aurel]

Author: aurel
Date: Sat Dec  4 01:37:53 2010
New Revision: 25868

Log:
use designated initializer in ASS (de)muxer

Modified:
   trunk/libavformat/assdec.c
   trunk/libavformat/assenc.c

Modified: trunk/libavformat/assdec.c
==============================================================================
--- trunk/libavformat/assdec.c	Sat Dec  4 01:23:08 2010	(r25867)
+++ trunk/libavformat/assdec.c	Sat Dec  4 01:37:53 2010	(r25868)
@@ -203,12 +203,12 @@ static int read_seek2(AVFormatContext *s
 }
 
 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,
 };

Modified: trunk/libavformat/assenc.c
==============================================================================
--- trunk/libavformat/assenc.c	Sat Dec  4 01:23:08 2010	(r25867)
+++ trunk/libavformat/assenc.c	Sat Dec  4 01:37:53 2010	(r25868)
@@ -78,15 +78,13 @@ static int write_trailer(AVFormatContext
 }
 
 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
 };