asfdec: move DAR list to ASFContext

[ffmpeg] / libavformat / rtpdec_qt.c

diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c
index 7dfc71fd669cf5d2caf74601da0e803b5f06bd77..28460a7ad9fb8478a652dc10ed6c9924903bb331 100644 (file)
--- a/libavformat/rtpdec_qt.c
+++ b/libavformat/rtpdec_qt.c
@@ -104,9 +104,9 @@ static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
 
         url_fseek(&pb, pos + 4, SEEK_SET);
         tag = get_le32(&pb);
-        if ((st->codec->codec_type == CODEC_TYPE_VIDEO &&
+        if ((st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
                  tag != MKTAG('v','i','d','e')) ||
-            (st->codec->codec_type == CODEC_TYPE_AUDIO &&
+            (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
                  tag != MKTAG('s','o','u','n')))
             return AVERROR_INVALIDDATA;
         av_set_pts_info(st, 32, 1, get_be32(&pb));
@@ -240,16 +240,15 @@ static void qt_rtp_free(PayloadContext *qt)
 
 #define RTP_QT_HANDLER(m, n, s, t) \
 RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \
-    s, \
-    t, \
-    CODEC_ID_NONE, \
-    NULL,          \
-    qt_rtp_new,    \
-    qt_rtp_free,   \
-    qt_rtp_parse_packet, \
+    .enc_name         = s, \
+    .codec_type       = t, \
+    .codec_id         = CODEC_ID_NONE, \
+    .open             = qt_rtp_new,    \
+    .close            = qt_rtp_free,   \
+    .parse_packet     = qt_rtp_parse_packet, \
 };
 
-RTP_QT_HANDLER(qt,        vid, "X-QT",        CODEC_TYPE_VIDEO);
-RTP_QT_HANDLER(qt,        aud, "X-QT",        CODEC_TYPE_AUDIO);
-RTP_QT_HANDLER(quicktime, vid, "X-QUICKTIME", CODEC_TYPE_VIDEO);
-RTP_QT_HANDLER(quicktime, aud, "X-QUICKTIME", CODEC_TYPE_AUDIO);
+RTP_QT_HANDLER(qt,        vid, "X-QT",        AVMEDIA_TYPE_VIDEO);
+RTP_QT_HANDLER(qt,        aud, "X-QT",        AVMEDIA_TYPE_AUDIO);
+RTP_QT_HANDLER(quicktime, vid, "X-QUICKTIME", AVMEDIA_TYPE_VIDEO);
+RTP_QT_HANDLER(quicktime, aud, "X-QUICKTIME", AVMEDIA_TYPE_AUDIO);