asfdec: move DAR list to ASFContext

[ffmpeg] / libavformat / cdg.c

diff --git a/libavformat/cdg.c b/libavformat/cdg.c
index f40028d2f967686cb17c0348cf9c420427dda000..ed3d78285b6086d71d2ab0c319a5ab8cc9ba5d90 100644 (file)
--- a/libavformat/cdg.c
+++ b/libavformat/cdg.c
@@ -32,7 +32,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
     if (!vst)
         return AVERROR(ENOMEM);
 
-    vst->codec->codec_type = CODEC_TYPE_VIDEO;
+    vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     vst->codec->codec_id   = CODEC_ID_CDGRAPHICS;
 
     /// 75 sectors/sec * 4 packets/sector = 300 packets/sec
@@ -55,7 +55,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat cdg_demuxer = {
+AVInputFormat ff_cdg_demuxer = {
     "cdg",
     NULL_IF_CONFIG_SMALL("CD Graphics Format"),
     0,