X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fisom.c;h=35c5eb982e0c4a748dcd0f7d3b2d7dc0c03c916c;hb=3749eede66c3774799766b1f246afae8a6ffc9bb;hp=df98779149060976111c97efa4a87d71785a144d;hpb=e5af9203098a889f36b759652615046254d45102;p=ffmpeg diff --git a/libavformat/isom.c b/libavformat/isom.c index df987791490..35c5eb982e0 100644 --- 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 */