avformat/mpegtsenc: move is_dvb_subtitle/is_dvb_teletext initialization upwards

[ffmpeg] / libavformat / rsoenc.c

diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c
index beba94b2a7c63c821bf599a12af7827acf29a4ab..fc327d8a2ff65d4352bbed2a74bf68b53f51ed99 100644 (file)
--- a/libavformat/rsoenc.c
+++ b/libavformat/rsoenc.c
@@ -91,7 +91,7 @@ static int rso_write_trailer(AVFormatContext *s)
     return 0;
 }
 
-AVOutputFormat ff_rso_muxer = {
+const AVOutputFormat ff_rso_muxer = {
     .name           =   "rso",
     .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO"),
     .extensions     =   "rso",
@@ -100,6 +100,6 @@ AVOutputFormat ff_rso_muxer = {
     .write_header   =   rso_write_header,
     .write_packet   =   ff_raw_write_packet,
     .write_trailer  =   rso_write_trailer,
-    .codec_tag      =   (const AVCodecTag* const []){ff_codec_rso_tags, 0},
+    .codec_tag      =   ff_rso_codec_tags_list,
     .flags          =   AVFMT_NOTIMESTAMPS,
 };