avformat: remove deprecated AVStream.codec

[ffmpeg] / libavformat / isom.c

diff --git a/libavformat/isom.c b/libavformat/isom.c
index e0e50f71b1b7af31aaab44376d7164d5feb9dd80..35c5eb982e0c4a748dcd0f7d3b2d7dc0c03c916c 100644 (file)
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -329,22 +329,12 @@ static const AVCodecTag mp4_audio_types[] = {
 int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb)
 {
     enum AVCodecID codec_id;
-    unsigned v;
     int len, tag;
     int ret;
     int object_type_id = avio_r8(pb);
     avio_r8(pb); /* stream type */
     avio_rb24(pb); /* buffer size db */
-
-    v = avio_rb32(pb);
-
-    // TODO: fix this with codecpar
-#if FF_API_LAVF_AVCTX
-FF_DISABLE_DEPRECATION_WARNINGS
-    if (v < INT32_MAX)
-        st->codec->rc_max_rate = v;
-FF_ENABLE_DEPRECATION_WARNINGS
-#endif
+    avio_rb32(pb); /* rc_max_rate */
 
     st->codecpar->bit_rate = avio_rb32(pb); /* avg bitrate */
 
@@ -418,45 +408,6 @@ static const MovChannelLayout mov_channel_layout[] = {
     { AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY,  (137<<16) | 5}, // kCAFChannelLayoutTag_DVD_11
     { 0, 0},
 };
-#if 0
-int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size)
-{
-    AVCodecContext *codec= st->codec;
-    uint32_t layout_tag;
-    AVIOContext *pb = s->pb;
-    const MovChannelLayout *layouts = mov_channel_layout;
-
-    if (size < 12)
-        return AVERROR_INVALIDDATA;
-
-    layout_tag = avio_rb32(pb);
-    size -= 4;
-    if (layout_tag == 0) { // kCAFChannelLayoutTag_UseChannelDescriptions
-        // Channel descriptions not implemented
-        av_log_ask_for_sample(s, "Unimplemented container channel layout.\n");
-        avio_skip(pb, size);
-        return 0;
-    }
-    if (layout_tag == 0x10000) { // kCAFChannelLayoutTag_UseChannelBitmap
-        codec->channel_layout = avio_rb32(pb);
-        size -= 4;
-        avio_skip(pb, size);
-        return 0;
-    }
-    while (layouts->channel_layout) {
-        if (layout_tag == layouts->layout_tag) {
-            codec->channel_layout = layouts->channel_layout;
-            break;
-        }
-        layouts++;
-    }
-    if (!codec->channel_layout)
-        av_log(s, AV_LOG_WARNING, "Unknown container channel layout.\n");
-    avio_skip(pb, size);
-
-    return 0;
-}
-#endif
 
 void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout)
 {