From patchwork Sun Apr 29 19:19:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8690 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2812601jad; Sun, 29 Apr 2018 12:20:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpy4Awdfyrxsm6LG4c09Zx6uQV+yZ0mbTwLb2rfTUDrsPxTGR3+oveYHbsA7AdC4mR8M/R5 X-Received: by 10.28.4.204 with SMTP id 195mr5456189wme.13.1525029648990; Sun, 29 Apr 2018 12:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525029648; cv=none; d=google.com; s=arc-20160816; b=lvNSFpFrr/ZJKJx0ZrlYH+9NE406TgxS0tPOCUdvb/n0eFdPKDhzilM5G6B2ddMAbz odheveVJCY0SPfDDwxt2evNqzFuC1SUs4ETrAhXn4deIyKC0jXIJbLUa67wXhTDbmOwE 2znR2WRljiLBu0GMwXdzpbk0dckxo6Vri6SrqNwQYfyikv/TAMhM8RByWngiIILH3JsX bIvhQZlcqdrfvcZ0DF79CqgNQ3US4aUIgOmSwM2eFGPsHeDJSb8wb8q/d5PpFou2qcQG i3GkAqMI9SZgkGAH9wqrHGD7COyhFlQa3mqxmrVEBGPgIWDpJcZLwFeYyC5Zw5pE/8aO uUtQ== 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:arc-authentication-results; bh=ZuxcjuM6arnxX1GnuFwHMjuoUI44FyCQNoGclqoiSsk=; b=JcnV9usR5ispekoGAUVK6sa9m40KYSKhpoCQGYP7zY1ZB+nzcFdCM2oe6LeCsWU51l iIenxfqpbACOtATaC1CiWFgXkaGEgfDsnoIA8SFqK1QdTxxl25jyiCoyACqtSx57Dg8e dM21ZjEjxLgC3EeYe8KudTbf0qoHX6ZntACIDD7uahM07NFfwYuhw/WJEcmrUcp9C0Wo XLYeLh24gtKtk07oULZvV9wwep3bjqP/5vYMc5UA1wYzx4DKcCBqwmAdQUj98a6simv5 unrqSZlyM4SD0GKxSvh4zwQTuT+fU39z4Iqy3tlqkGRAzkt/FZ96wBJyHsohGzJuxgGy IG6Q== 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 89-v6si5100725wrl.416.2018.04.29.12.20.48; Sun, 29 Apr 2018 12:20:48 -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 38C3E68A670; Sun, 29 Apr 2018 22:20:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-3.mx.upcmail.net (vie01a-dmta-pe06-3.mx.upcmail.net [84.116.36.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 144D868A65C for ; Sun, 29 Apr 2018 22:20:04 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fCrsB-0000Gh-Ry for ffmpeg-devel@ffmpeg.org; Sun, 29 Apr 2018 21:20:35 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id gKLV1x01k0S5wYM01KLW3z; Sun, 29 Apr 2018 21:20:30 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 29 Apr 2018 21:19:16 +0200 Message-Id: <20180429191918.2915-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180429191918.2915-1-michael@niedermayer.cc> References: <20180429191918.2915-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/mpeg4videode: Eliminate out of loop VOP startcode reading for studio profile 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 --- libavcodec/mpeg4videodec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 9ee2f37c69..9318d7bd4e 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2931,9 +2931,6 @@ static int decode_studio_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb) if (get_bits_left(gb) <= 32) return 0; - if (get_bits_long(gb, 32) != VOP_STARTCODE) - return AVERROR_INVALIDDATA; - s->decode_mb = mpeg4_decode_studio_mb; decode_smpte_tc(ctx, gb); @@ -3183,7 +3180,6 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb) if (s->studio_profile) { if ((ret = decode_studio_vol_header(ctx, gb)) < 0) return ret; - break; } else { if ((ret = decode_vol_header(ctx, gb)) < 0) return ret;