From patchwork Thu May 20 21:25:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27848 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2810463iof; Thu, 20 May 2021 14:32:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy96tmgX4VbIfRXTTZYXKoiN+Day8dyP+muzw7sspeo0Pto1hoYzWhldhZetiV6mbSWnqDA X-Received: by 2002:a05:6402:3488:: with SMTP id v8mr6986252edc.51.1621546364667; Thu, 20 May 2021 14:32:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621546364; cv=none; d=google.com; s=arc-20160816; b=aieLjMd7KLgsd8IEvalxwSKYHR3Qqz/dnvlUKJtuaAFnQpK4cJ3bZK+d7OIpiy8ODK gFPBJZS0BDQs0ZnXNe9AMtG6mjADnwrgKLwL+ROtnUhI3zmJVCeLi2vXfcLmV2kE9apN dJ603tlpQ1OfFyywNOd/za8pZZFjrxlqQkHDJSFxY0ISJHPzaVPsaKJJI1565NdtwskZ JdDjSjf0R2nfqOUTSHWuS6k0fXwny6BMIYWwz68zi8D8XB4xVy4DQ7Ur9LUo8DEfnzfv iJuTTrxNqe46GTgVBThJt05k15JORQQ9Ttw/YHU+JrIzgNhnGPurmiH5g3oSA9kcVgLH HL/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=JWfoUGaDGwGhFZOsG1Mol20H596tgb0QubwRpDK1VBo=; b=yufwCKakg18HH1OO5lwEQHXCGBVxXspH7S4yvCTChW83Xh+6CwOtxPpQ/wHAGK76UJ Z6FWmlA686BoUaLuWbxMK1l19Kxr+8ftBoheOe20/y5Wk1IEHP85Rk7ss9TZKF5QX3v3 BOQ5WjXqOTjBpR9egM/0Dw6yB/jVcdeiJOT6htULG5ZO4hkAx0+7t9xf146JbhR1dNnm moE3v4/B3EuWK2UTyyHRSm/LaKkKgNtValQuYRD+86sxG94d3GjpoiXhL91X2Ndwa4tx eSyVb3U7ctqHNzX51NALaL8veZKp5tc9yATCeleerLMjN6o6wsxI71m3J+FV+/dyQ1Ww 8kcQ== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nd5si1174562ejc.395.2021.05.20.14.32.44; Thu, 20 May 2021 14:32:44 -0700 (PDT) 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 BE885689900; Fri, 21 May 2021 00:32:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0AD56891CF for ; Fri, 21 May 2021 00:32:32 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ljqBu-00EBB3-0G for ffmpeg-devel@ffmpeg.org; Thu, 20 May 2021 23:26:50 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id jqAwlAblfljeHjqAwlB0rN; Thu, 20 May 2021 23:25:50 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=BDMuF1j9A3W1Wg_cwMcA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 20 May 2021 23:25:48 +0200 Message-Id: <20210520212549.15466-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210520212549.15466-1-michael@niedermayer.cc> References: <20210520212549.15466-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfOwP3nA6oJVkwTCOj/FrR2u1vBA6XHKIGMwib2RpTePedoEWyxNlnfkLlbUZLOXdTKKp8KxFsT8g0zq6cOCqzB4IMXeRlj20rhYviJzWNJw+1b8HB+9u Rtf+dxiiwDSPNvpSvbHOptScCcxZa7QmqEwy58NBaql3jhxYNlkbTQAh Subject: [FFmpeg-devel] [PATCH 2/3] Remove format (Alternative solution for CID1477423) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: ISg96szVsLq3 Signed-off-by: Michael Niedermayer --- libavformat/moflex.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/moflex.c b/libavformat/moflex.c index dd4e7e0726..234b0fb06e 100644 --- a/libavformat/moflex.c +++ b/libavformat/moflex.c @@ -172,7 +172,6 @@ static int moflex_read_sync(AVFormatContext *s) unsigned type, ssize, codec_id = 0; unsigned codec_type, width = 0, height = 0, sample_rate = 0, channels = 0; int stream_index = -1; - int format = AV_PIX_FMT_NONE; AVRational fps; read_var_byte(s, &type); @@ -213,7 +212,6 @@ static int moflex_read_sync(AVFormatContext *s) fps.den = avio_rb16(pb); width = avio_rb16(pb); height = avio_rb16(pb); - format = AV_PIX_FMT_YUV420P; avio_skip(pb, type == 3 ? 3 : 2); break; case 4: @@ -235,7 +233,6 @@ static int moflex_read_sync(AVFormatContext *s) st->codecpar->height = height; st->codecpar->sample_rate= sample_rate; st->codecpar->channels = channels; - st->codecpar->format = format; st->priv_data = av_packet_alloc(); if (!st->priv_data) return AVERROR(ENOMEM);