aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2010-12-04 00:37:53 +0000
committerAurelien Jacobs <aurel@gnuage.org>2010-12-04 00:37:53 +0000
commit87d69d323204e69e49abaa1e0e9033296cb2a539 (patch)
treea469b4fdc5c9e5aa3c25b03708ed8d6bc45c79a8
parent6fbd85edc8df1e81f85c06bf184d2b6638b140a5 (diff)
downloadffmpeg-87d69d323204e69e49abaa1e0e9033296cb2a539.tar.gz
use designated initializer in ASS (de)muxer
Originally committed as revision 25868 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/assdec.c16
-rw-r--r--libavformat/assenc.c18
2 files changed, 16 insertions, 18 deletions
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 9f03b88491..ffce157995 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 9b854ec0fe..9a2f966dff 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
};