pcmdec: remove dependency from rawdec

[ffmpeg] / libavformat / vc1testenc.c

diff --git a/libavformat/vc1testenc.c b/libavformat/vc1testenc.c
index a1228d8d7052c26518c6c584e6ceec32f499fdc6..abe8c6b231260efb9ee567a54337726685451a14 100644 (file)
--- a/libavformat/vc1testenc.c
+++ b/libavformat/vc1testenc.c
@@ -30,7 +30,7 @@ static int vc1test_write_header(AVFormatContext *s)
     AVCodecContext *avc = s->streams[0]->codec;
     AVIOContext *pb = s->pb;
 
-    if (avc->codec_id != CODEC_ID_WMV3) {
+    if (avc->codec_id != AV_CODEC_ID_WMV3) {
         av_log(s, AV_LOG_ERROR, "Only WMV3 is accepted!\n");
         return -1;
     }
@@ -44,8 +44,8 @@ static int vc1test_write_header(AVFormatContext *s)
     avio_wl24(pb, 0); // hrd_buffer
     avio_w8(pb, 0x80); // level|cbr|res1
     avio_wl32(pb, 0); // hrd_rate
-    if (s->streams[0]->r_frame_rate.den && s->streams[0]->r_frame_rate.num == 1)
-        avio_wl32(pb, s->streams[0]->r_frame_rate.den);
+    if (s->streams[0]->avg_frame_rate.den && s->streams[0]->avg_frame_rate.num == 1)
+        avio_wl32(pb, s->streams[0]->avg_frame_rate.den);
     else
         avio_wl32(pb, 0xFFFFFFFF); //variable framerate
     avpriv_set_pts_info(s->streams[0], 32, 1, 1000);
@@ -88,8 +88,8 @@ AVOutputFormat ff_vc1t_muxer = {
     .mime_type         = "",
     .extensions        = "rcv",
     .priv_data_size    = sizeof(RCVContext),
-    .audio_codec       = CODEC_ID_NONE,
-    .video_codec       = CODEC_ID_WMV3,
+    .audio_codec       = AV_CODEC_ID_NONE,
+    .video_codec       = AV_CODEC_ID_WMV3,
     .write_header      = vc1test_write_header,
     .write_packet      = vc1test_write_packet,
     .write_trailer     = vc1test_write_trailer,