utvideoenc: optimize and simplify mangle_rgb_planes
[ffmpeg.git] / libavformat / act.c
index 5c414f0..78f1d3b 100644 (file)
@@ -60,8 +60,7 @@ static int probe(AVProbeData *p)
     return AVPROBE_SCORE_MAX;
 }
 
-static int read_header(AVFormatContext *s,
-                           AVFormatParameters *ap)
+static int read_header(AVFormatContext *s)
 {
     ACTContext* ctx = s->priv_data;
     AVIOContext *pb = s->pb;
@@ -91,7 +90,7 @@ static int read_header(AVFormatContext *s,
     st->codec->channels=1;
     avpriv_set_pts_info(st, 64, 1, 100);
 
-    st->codec->codec_id=CODEC_ID_G729;
+    st->codec->codec_id=AV_CODEC_ID_G729;
 
     avio_seek(pb, 257, SEEK_SET);
     msec=avio_rl16(pb);