From patchwork Thu Nov 3 22:31:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 1276 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1028464vsb; Thu, 3 Nov 2016 15:32:56 -0700 (PDT) X-Received: by 10.28.157.137 with SMTP id g131mr228817wme.29.1478212375925; Thu, 03 Nov 2016 15:32:55 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h194si1408621wmd.115.2016.11.03.15.32.55; Thu, 03 Nov 2016 15:32:55 -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; dkim=neutral (body hash did not verify) header.i=@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 E0FE7689E07; Fri, 4 Nov 2016 00:32:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E20FB689DEF for ; Fri, 4 Nov 2016 00:32:43 +0200 (EET) Received: by mail-pf0-f173.google.com with SMTP id 189so38765139pfz.3 for ; Thu, 03 Nov 2016 15:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=AHZiH34nwNp11fdWadbhrBDWudTvqHNWDpfmc0EOFO0=; b=LwCW05CnLSLRqL7eHxEiIQt2+Ac/8OhSR4ZNyOPvVaOv2incws1djmFtayEbQBxZAC 79iTr2B6acy0ihzCwl0i2H39uEJ3fIG4M3zMu2SGc+4PyQOIdqBuL8plNnnWLQv+Ez0A 4Qikn65UJjhgVJx3co5PrEXYu7mgatKcs8oU8CAxxU6hs/9Tz3IYrvfzrt4fKAcRDVI/ bgNz9UmSugUAuu9aJ6lvXlrLDh9y0VIH/igkdoHBvuRQC8eBo7W8nN0MDp6n7X8rzhoE fY/ZovZPhVRe/bl3Q5k+PLZs276Xuya9HqOqD/jIzuzMSYCYxoMTAW3HTsSrjGEEBPI8 XOVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AHZiH34nwNp11fdWadbhrBDWudTvqHNWDpfmc0EOFO0=; b=VN7lDgNlvYOviYY+BK2PM3utW8mQ4Dv4Yg+XL+6qsU7y3IAFb2RYnJP4FZ1JA5HN16 FPRS3V1C3NzUxCHNK3f+lUXFhmoA560eKCutXkhXNS9ZVJjWIEkMmYSR2LFPGDv5CVLq ap2zeUBfX/HoXIEoxvJ73a2ZdtfkBVq1Dgy7irIZsoeX3pa/RNkuprdWEd4opgKWWYiF 4fl2TrsezY78v8oxsxluqys3F7x7HmtPuZ8bxZy7TtpklwqPDyoWKe5GZGARDGyl1NjR VsNSQaVo13U9voekGf2E/lKW9lh0O3Z2osU6K4uilZMJmFqXsgxyMOb0kyyK/Jd04/AK aUlQ== X-Gm-Message-State: ABUngvfSq34KcKH2uyNXGHL/nxCRBihNA6ZtwkUF4MYNw1yVN7O1mua1GhOYbAtw4IlIE1+d X-Received: by 10.99.128.198 with SMTP id j189mr17178098pgd.151.1478212365517; Thu, 03 Nov 2016 15:32:45 -0700 (PDT) Received: from isasi.mtv.corp.google.com ([172.27.82.89]) by smtp.gmail.com with ESMTPSA id yc7sm15035690pab.24.2016.11.03.15.32.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Nov 2016 15:32:44 -0700 (PDT) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Nov 2016 15:31:14 -0700 Message-Id: <1478212274-21980-1-git-send-email-isasi@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Subject: [FFmpeg-devel] [PATCH] lavc/utils.c: Make sure skip_samples never goes negative. 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: Sasi Inguva MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Sasi Inguva --- libavcodec/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 87de15f..a33afaa 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2391,7 +2391,9 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx, if ((frame->flags & AV_FRAME_FLAG_DISCARD) && *got_frame_ptr && !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) { - avctx->internal->skip_samples -= frame->nb_samples; + if (avctx->internal->skip_samples >= frame->nb_samples) { + avctx->internal->skip_samples -= frame->nb_samples; + } *got_frame_ptr = 0; }