swf(dec): replace CODEC_ID with AV_CODEC_ID

[ffmpeg] / libavformat / rawdec.c

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 73b3709ac12b3fa6c283f1f73e1082458c4fbade..a64c406bf1961958ad34af12db36ddd08dc0ba51 100644 (file)
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -32,14 +32,14 @@
 int ff_raw_read_header(AVFormatContext *s)
 {
     AVStream *st;
-    enum CodecID id;
+    enum AVCodecID id;
 
     st = avformat_new_stream(s, NULL);
     if (!st)
         return AVERROR(ENOMEM);
 
         id = s->iformat->raw_codec_id;
-        if (id == CODEC_ID_RAWVIDEO) {
+        if (id == AV_CODEC_ID_RAWVIDEO) {
             st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
         } else {
             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
@@ -52,7 +52,7 @@ int ff_raw_read_header(AVFormatContext *s)
 
             st->codec->channels = 1;
 
-            if (id == CODEC_ID_ADPCM_G722)
+            if (id == AV_CODEC_ID_ADPCM_G722)
                 st->codec->sample_rate = 16000;
 
             if (s1 && s1->sample_rate)
@@ -158,8 +158,11 @@ int ff_raw_video_read_header(AVFormatContext *s)
         goto fail;
     }
 
-    st->r_frame_rate = st->avg_frame_rate = framerate;
-    avpriv_set_pts_info(st, 64, 1, 1200000);
+#if FF_API_R_FRAME_RATE
+    st->r_frame_rate =
+#endif
+    st->avg_frame_rate = framerate;
+    avpriv_set_pts_info(st, 64, framerate.den, framerate.num);
 
 fail:
     return ret;
@@ -180,9 +183,9 @@ AVInputFormat ff_g722_demuxer = {
     .long_name      = NULL_IF_CONFIG_SMALL("raw G.722"),
     .read_header    = ff_raw_read_header,
     .read_packet    = ff_raw_read_partial_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .extensions = "g722,722",
-    .raw_codec_id   = CODEC_ID_ADPCM_G722,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "g722,722",
+    .raw_codec_id   = AV_CODEC_ID_ADPCM_G722,
 };
 #endif
 
@@ -192,14 +195,14 @@ AVInputFormat ff_latm_demuxer = {
     .long_name      = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"),
     .read_header    = ff_raw_audio_read_header,
     .read_packet    = ff_raw_read_partial_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .extensions = "latm",
-    .raw_codec_id   = CODEC_ID_AAC_LATM,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "latm",
+    .raw_codec_id   = AV_CODEC_ID_AAC_LATM,
 };
 #endif
 
 #if CONFIG_MJPEG_DEMUXER
-FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg", CODEC_ID_MJPEG)
+FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg", AV_CODEC_ID_MJPEG)
 #endif
 
 #if CONFIG_MLP_DEMUXER
@@ -208,9 +211,9 @@ AVInputFormat ff_mlp_demuxer = {
     .long_name      = NULL_IF_CONFIG_SMALL("raw MLP"),
     .read_header    = ff_raw_audio_read_header,
     .read_packet    = ff_raw_read_partial_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .extensions = "mlp",
-    .raw_codec_id   = CODEC_ID_MLP,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "mlp",
+    .raw_codec_id   = AV_CODEC_ID_MLP,
 };
 #endif
 
@@ -220,9 +223,9 @@ AVInputFormat ff_truehd_demuxer = {
     .long_name      = NULL_IF_CONFIG_SMALL("raw TrueHD"),
     .read_header    = ff_raw_audio_read_header,
     .read_packet    = ff_raw_read_partial_packet,
-    .flags= AVFMT_GENERIC_INDEX,
-    .extensions = "thd",
-    .raw_codec_id   = CODEC_ID_TRUEHD,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "thd",
+    .raw_codec_id   = AV_CODEC_ID_TRUEHD,
 };
 #endif
 
@@ -233,11 +236,11 @@ AVInputFormat ff_shorten_demuxer = {
     .read_header    = ff_raw_audio_read_header,
     .read_packet    = ff_raw_read_partial_packet,
     .flags          = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK,
-    .extensions = "shn",
-    .raw_codec_id   = CODEC_ID_SHORTEN,
+    .extensions     = "shn",
+    .raw_codec_id   = AV_CODEC_ID_SHORTEN,
 };
 #endif
 
 #if CONFIG_VC1_DEMUXER
-FF_DEF_RAWVIDEO_DEMUXER(vc1, "raw VC-1", NULL, "vc1", CODEC_ID_VC1)
+FF_DEF_RAWVIDEO_DEMUXER(vc1, "raw VC-1", NULL, "vc1", AV_CODEC_ID_VC1)
 #endif