avformat/mpegtsenc: move is_dvb_subtitle/is_dvb_teletext initialization upwards

[ffmpeg] / libavformat / xvag.c

diff --git a/libavformat/xvag.c b/libavformat/xvag.c
index 22e4f1e3c8748870bc89269ed87da0719001d76b..55bc25227e5d0a3f2cf9523041e953780076c55d 100644 (file)
--- a/libavformat/xvag.c
+++ b/libavformat/xvag.c
@@ -24,7 +24,7 @@
 #include "avformat.h"
 #include "internal.h"
 
-static int xvag_probe(AVProbeData *p)
+static int xvag_probe(const AVProbeData *p)
 {
     if (memcmp(p->buf, "XVAG", 4) ||
         memcmp(p->buf+32, "fmat", 4))
@@ -103,7 +103,7 @@ static int xvag_read_packet(AVFormatContext *s, AVPacket *pkt)
     return av_get_packet(s->pb, pkt, par->block_align);
 }
 
-AVInputFormat ff_xvag_demuxer = {
+const AVInputFormat ff_xvag_demuxer = {
     .name           = "xvag",
     .long_name      = NULL_IF_CONFIG_SMALL("Sony PS3 XVAG"),
     .read_probe     = xvag_probe,