From patchwork Sat Jan 28 12:52:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Meijles X-Patchwork-Id: 2345 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp676079vsb; Sat, 28 Jan 2017 04:54:06 -0800 (PST) X-Received: by 10.28.147.147 with SMTP id v141mr7836210wmd.110.1485608046214; Sat, 28 Jan 2017 04:54:06 -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 y17si9556096wrb.0.2017.01.28.04.54.05; Sat, 28 Jan 2017 04:54:06 -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 A795E68A743; Sat, 28 Jan 2017 14:54:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from lunar.bitpit.net (lunar.bitpit.net [193.46.80.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8957968A465 for ; Sat, 28 Jan 2017 14:53:56 +0200 (EET) Received: by lunar.bitpit.net (Postfix, from userid 115) id 208B127A1E8C; Sat, 28 Jan 2017 13:53:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lunar.bitpit.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Received: from Thing.com (151-163-ftth.onsbrabantnet.nl [88.159.163.151]) by lunar.bitpit.net (Postfix) with ESMTPSA id 37D7327A0A08; Sat, 28 Jan 2017 13:53:56 +0100 (CET) From: Marijn Meijles To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Jan 2017 13:52:30 +0100 Message-Id: <20170128125230.87305-2-marijn@bitpit.net> X-Mailer: git-send-email 2.10.1 (Apple Git-78) In-Reply-To: <20170128125230.87305-1-marijn@bitpit.net> References: <20170128125230.87305-1-marijn@bitpit.net> Subject: [FFmpeg-devel] [PATCH] Fix to prevent runaway ac3 detection by looking at the actual frame rather than the first detected frame. 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 Cc: Marijn Meijles MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marijn Meijles --- libavformat/ac3dec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index 363a32e..e85b0ac 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -49,8 +49,8 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id) buf2+=16; if (buf[0] == 0x77 && buf[1] == 0x0B) { for(i=0; i<8; i+=2) { - buf3[i ] = buf[i+1]; - buf3[i+1] = buf[i ]; + buf3[i ] = buf2[i+1]; + buf3[i+1] = buf2[i ]; } init_get_bits(&gbc, buf3, 54); }else @@ -62,8 +62,8 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id) if (buf[0] == 0x77 && buf[1] == 0x0B) { av_assert0(phdr->frame_size <= sizeof(buf3)); for(i=8; iframe_size; i+=2) { - buf3[i ] = buf[i+1]; - buf3[i+1] = buf[i ]; + buf3[i ] = buf2[i+1]; + buf3[i+1] = buf2[i ]; } } if(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, gbc.buffer + 2, phdr->frame_size - 2))