From patchwork Fri Nov 4 22:31:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 1305 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp62302vsb; Fri, 4 Nov 2016 15:34:11 -0700 (PDT) X-Received: by 10.28.50.66 with SMTP id y63mr545560wmy.44.1478298851282; Fri, 04 Nov 2016 15:34:11 -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 65si7615957wml.99.2016.11.04.15.34.10; Fri, 04 Nov 2016 15:34:11 -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 18A18689E0E; Sat, 5 Nov 2016 00:34:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f179.google.com (mail-pf0-f179.google.com [209.85.192.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D7F4680D2F for ; Sat, 5 Nov 2016 00:33:58 +0200 (EET) Received: by mail-pf0-f179.google.com with SMTP id n85so58532690pfi.1 for ; Fri, 04 Nov 2016 15:34:02 -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:in-reply-to:references; bh=CJX7OUYt9gT035Vktd0yxjZ4dIabzWtwdePft5awzY8=; b=RCoI/fQpqeNORzcF48t007wTCkQNBZ7CbthzVFMaM91xrWtq3swVbmjsw/EMR9FxFN r451iYDrTuOmpstzcuM0uSCjWb8DliYiwEoMJjHgVn3Zye6FXcVHW1PqSM6gfQuVbOWp 2FB3Fil4wBGMDh2t11ZIb903HPNZtQsu0k90j2QqKwoKU1965ngp9tuHAxYKlfD6TWLD eJIg868J2uQOQGYOQ4QS/BHqEnLXS6nR2qrdKY6JUvuz+QLIQRqWy9+os/X1a+SYrM6n 78fI7qSPJQwsYuT45HKpYoP9w6VyThbPX8e4caEYdlp0GsQqW1B9fYS0f7Hc+9hjxW3h XsWQ== 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:in-reply-to :references; bh=CJX7OUYt9gT035Vktd0yxjZ4dIabzWtwdePft5awzY8=; b=LjjDpQNIgRu2bdJrMNzMiTxmVCvulHEiWQiZkI8n0KdjgXgYnTl3mcwpX4wTJmpU2C QqLxi+8bQRysPxP8eg2tpphL+S0xCR1121jXaLAMingJSFiQmgapKTdZOx5A6uI5k4pA HRnSIegZq3dT5/Mxvs2qTwmfOvv+nFQCeHpTFwdit/A6gYIfhGURMnpPXWAXNj/0FuB5 BbNvEGV7ZPSaKfxfc8fbHsULp0B5b/lHkDl4J0CUmj/tjYQUlK3BjE6bTwYd/kDinQvN coLzd0jLoOebn/kftyzc5DKfhaQMGpQAUn6g6wYFJP+Ci60gWef7sqqzptGRc7yIXZei jllg== X-Gm-Message-State: ABUngve/qI/1cVBkPIo0A11IrVLvzUXuy2SbWWDDE+xX8cYCtHCrhfJdduHpfF2j8ACdBrbO X-Received: by 10.98.70.29 with SMTP id t29mr30841033pfa.185.1478298839760; Fri, 04 Nov 2016 15:33:59 -0700 (PDT) Received: from isasi.mtv.corp.google.com ([172.27.82.89]) by smtp.gmail.com with ESMTPSA id cp2sm22723324pad.3.2016.11.04.15.33.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Nov 2016 15:33:59 -0700 (PDT) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Nov 2016 15:31:58 -0700 Message-Id: <1478298718-16356-1-git-send-email-isasi@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: References: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 87de15f..d6dca18 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2391,7 +2391,7 @@ 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; + avctx->internal->skip_samples = FFMAX(0, avctx->internal->skip_samples - frame->nb_samples); *got_frame_ptr = 0; }