From patchwork Fri Dec 2 23:52:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1665 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp556240vsa; Fri, 2 Dec 2016 15:53:46 -0800 (PST) X-Received: by 10.194.59.98 with SMTP id y2mr39908463wjq.166.1480722826446; Fri, 02 Dec 2016 15:53:46 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id aj4si7070437wjd.196.2016.12.02.15.53.46; Fri, 02 Dec 2016 15:53:46 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26CBC689FB6; Sat, 3 Dec 2016 01:53:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-2.mx.upcmail.net (vie01a-dmta-pe02-2.mx.upcmail.net [62.179.121.158]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BC8F689F7E for ; Sat, 3 Dec 2016 01:52:56 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cCxdY-0000NA-Kl for ffmpeg-devel@ffmpeg.org; Sat, 03 Dec 2016 00:53:04 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id FBt31u01N0S5wYM01Bt4UV; Sat, 03 Dec 2016 00:53:04 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 3 Dec 2016 00:52:58 +0100 Message-Id: <20161202235258.26223-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161202235258.26223-1-michael@niedermayer.cc> References: <20161202235258.26223-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/5] avformat/ffmdec: remove last use of st->codec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavformat/ffmdec.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index f3497e2b24..9b9373eae5 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -276,7 +276,7 @@ static int ffm_append_recommended_configuration(AVStream *st, char **conf) #define VALIDATE_PARAMETER(parameter, name, check) { \ if (check) { \ - av_log(codec, AV_LOG_ERROR, "Invalid " name " %d\n", codecpar->parameter); \ + av_log(s, AV_LOG_ERROR, "Invalid " name " %d\n", codecpar->parameter); \ ret = AVERROR_INVALIDDATA; \ goto fail; \ } \ @@ -287,7 +287,7 @@ static int ffm2_read_header(AVFormatContext *s) FFMContext *ffm = s->priv_data; AVStream *st; AVIOContext *pb = s->pb; - AVCodecContext *codec, *dummy_codec = NULL; + AVCodecContext *dummy_codec = NULL; AVCodecParameters *codecpar; const AVCodecDescriptor *codec_desc; int ret, i; @@ -319,6 +319,7 @@ static int ffm2_read_header(AVFormatContext *s) unsigned size = avio_rb32(pb); int64_t next = avio_tell(pb) + size; char rc_eq_buf[128]; + int flags; if(!id) break; @@ -342,7 +343,6 @@ static int ffm2_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, 1000000); - codec = st->codec; codecpar = st->codecpar; /* generic info */ codecpar->codec_id = avio_rb32(pb); @@ -364,14 +364,19 @@ static int ffm2_read_header(AVFormatContext *s) } codecpar->bit_rate = avio_rb32(pb); if (codecpar->bit_rate < 0) { - av_log(codec, AV_LOG_ERROR, "Invalid bit rate %"PRId64"\n", codecpar->bit_rate); + av_log(s, AV_LOG_ERROR, "Invalid bit rate %"PRId64"\n", codecpar->bit_rate); ret = AVERROR_INVALIDDATA; goto fail; } - codec->flags = avio_rb32(pb); + flags = avio_rb32(pb); +#if FF_API_LAVF_AVCTX +FF_DISABLE_DEPRECATION_WARNINGS + st->codec->flags = flags; +FF_ENABLE_DEPRECATION_WARNINGS +#endif avio_rb32(pb); avio_rb32(pb); - if (codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { + if (flags & AV_CODEC_FLAG_GLOBAL_HEADER) { int size = avio_rb32(pb); if (size < 0 || size >= FF_MAX_EXTRADATA_SIZE) { av_log(s, AV_LOG_ERROR, "Invalid extradata size %d\n", size); @@ -536,7 +541,7 @@ static int ffm_read_header(AVFormatContext *s) FFMContext *ffm = s->priv_data; AVStream *st; AVIOContext *pb = s->pb; - AVCodecContext *codec, *dummy_codec = NULL; + AVCodecContext *dummy_codec = NULL; AVCodecParameters *codecpar; const AVCodecDescriptor *codec_desc; int i, nb_streams, ret; @@ -567,6 +572,7 @@ static int ffm_read_header(AVFormatContext *s) /* read each stream */ for(i=0;icodec; /* generic info */ codecpar->codec_id = avio_rb32(pb); codec_desc = avcodec_descriptor_get(codecpar->codec_id); @@ -593,10 +598,15 @@ static int ffm_read_header(AVFormatContext *s) } codecpar->bit_rate = avio_rb32(pb); if (codecpar->bit_rate < 0) { - av_log(codec, AV_LOG_WARNING, "Invalid bit rate %"PRId64"\n", codecpar->bit_rate); + av_log(s, AV_LOG_WARNING, "Invalid bit rate %"PRId64"\n", codecpar->bit_rate); goto fail; } - codec->flags = avio_rb32(pb); + flags = avio_rb32(pb); +#if FF_API_LAVF_AVCTX +FF_DISABLE_DEPRECATION_WARNINGS + st->codec->flags = flags; +FF_ENABLE_DEPRECATION_WARNINGS +#endif avio_rb32(pb); avio_rb32(pb); /* specific info */ @@ -665,7 +675,7 @@ static int ffm_read_header(AVFormatContext *s) default: goto fail; } - if (codec->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { + if (flags & AV_CODEC_FLAG_GLOBAL_HEADER) { int size = avio_rb32(pb); if (size < 0 || size >= FF_MAX_EXTRADATA_SIZE) { av_log(s, AV_LOG_ERROR, "Invalid extradata size %d\n", size);