swf(dec): replace CODEC_ID with AV_CODEC_ID

[ffmpeg] / libavformat / ffmdec.c

diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 089609f3eebc1133bd436da32ba146567a76cfe4..c4ee22e73a30fd656bf42c3e818e3f566937f56f 100644 (file)
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -332,8 +332,6 @@ static int ffm_read_header(AVFormatContext *s)
             codec->dct_algo = avio_rb32(pb);
             codec->strict_std_compliance = avio_rb32(pb);
             codec->max_b_frames = avio_rb32(pb);
-            codec->luma_elim_threshold = avio_rb32(pb);
-            codec->chroma_elim_threshold = avio_rb32(pb);
             codec->mpeg_quant = avio_rb32(pb);
             codec->intra_dc_precision = avio_rb32(pb);
             codec->me_method = avio_rb32(pb);
@@ -510,7 +508,7 @@ static int ffm_probe(AVProbeData *p)
 
 AVInputFormat ff_ffm_demuxer = {
     .name           = "ffm",
-    .long_name      = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed) format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("FFM (AVserver live feed)"),
     .priv_data_size = sizeof(FFMContext),
     .read_probe     = ffm_probe,
     .read_header    = ffm_read_header,