From patchwork Thu Dec 15 05:05:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Koshevoy X-Patchwork-Id: 1803 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp552177vsa; Wed, 14 Dec 2016 21:06:33 -0800 (PST) X-Received: by 10.28.113.197 with SMTP id d66mr10393114wmi.77.1481778393825; Wed, 14 Dec 2016 21:06:33 -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 jp8si311557wjc.10.2016.12.14.21.06.33; Wed, 14 Dec 2016 21:06:33 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D580C689948; Thu, 15 Dec 2016 07:06:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C84F68922F for ; Thu, 15 Dec 2016 07:06:18 +0200 (EET) Received: by mail-pg0-f67.google.com with SMTP id p66so4755271pga.2 for ; Wed, 14 Dec 2016 21:06:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Frkppr2Ka0Zkcv4CCfZAskV/EuZoeOkgyZV77D4JEOQ=; b=mvyOPc0Jrr1Th7QdkwRmD7+r4zj66ZjAbPKSIEo0tnSNk3Nh1jNtGdFXRZYyP/HwIv osoyayCLYzE950L0GyBTj6e2R56YO4VZ4dYEdJ/v7cbwyX6TxSVGfZ58svmxcwE0GUzw KUwoQNzZkHFkYYXqcJzgK+1kcgmclHsT5IF4DhwVDtLeLanx6y844K3hmE3YuHE1QOi4 Yp6DzsWqwz/0zhg57do5IcB6S2gwHQkWxvakNFaQBvamfg2jY5eRLaJuKRY3A2U2uJou +DKR/rgV01xy8W5+8S6slztbunvrgD0LpfgVwnuEHmzEVsUZVNmsRPm+kC2LSMUUcP5p 57tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Frkppr2Ka0Zkcv4CCfZAskV/EuZoeOkgyZV77D4JEOQ=; b=cFczmRjy39bFtJ1sPJ27UiuHLsnwo0/O6msQZLviAiU+b7W1TwavpSgG5+6GoH45ex aF/Pvq72WjkSXKHmAlzRVlu0IBfApl+JYjmGuvSZXAi6TzN/AhIp9corgPb/XkIdpoZx 2WyTaZhaqbSQhNcS2dF/HX+AFw44Osadu0E0W/DX8+32zTKBCk7iqParGfSTF0tzS0Xb RIZ6dDhO/UbcVTagRqWXjLZVJNIT72P1G5nnADUh0qWWjI4FK1oBcDb21GcGL/8NZavt Q+rVYGnVHqmsfFQcS4U6Tf+HX+gYccmbA/rkyV52OobLo3CNGI2BgLcDUB1HC2xhjVck pzxQ== X-Gm-Message-State: AKaTC03D1mtFRscScTttAHO8EUhCMKUWGN1DaMd1IUDPfMZSxuIxEFxWI9NkyHq/iNtMPQ== X-Received: by 10.98.219.5 with SMTP id f5mr445855pfg.131.1481778382586; Wed, 14 Dec 2016 21:06:22 -0800 (PST) Received: from homestead.aragog.com ([136.60.170.51]) by smtp.gmail.com with ESMTPSA id y134sm476295pfg.81.2016.12.14.21.06.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Dec 2016 21:06:22 -0800 (PST) From: pkoshevoy@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Dec 2016 22:05:50 -0700 Message-Id: <1481778350-5095-1-git-send-email-pkoshevoy@gmail.com> X-Mailer: git-send-email 2.6.6 Subject: [FFmpeg-devel] [PATCH] lavc: Fix ticket 6024 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: Pavel Koshevoy MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Pavel Koshevoy --- libavcodec/utils.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 44ecc09..2ad96e4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2788,8 +2788,6 @@ static int do_decode(AVCodecContext *avctx, AVPacket *pkt) if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { ret = avcodec_decode_video2(avctx, avctx->internal->buffer_frame, &got_frame, pkt); - if (ret >= 0) - ret = pkt->size; } else if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) { ret = avcodec_decode_audio4(avctx, avctx->internal->buffer_frame, &got_frame, pkt);