From patchwork Wed Oct 26 19:40:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 1184 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp219946vsd; Wed, 26 Oct 2016 12:51:32 -0700 (PDT) X-Received: by 10.28.150.20 with SMTP id y20mr9621600wmd.67.1477511492042; Wed, 26 Oct 2016 12:51:32 -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 15si12419131wmo.95.2016.10.26.12.51.31; Wed, 26 Oct 2016 12:51:32 -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=@overt.org; dkim=neutral (body hash did not verify) header.i=@overt.org; 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 0538A689E50; Wed, 26 Oct 2016 22:51:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from rs224.mailgun.us (rs224.mailgun.us [209.61.151.224]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 828B4689E24 for ; Wed, 26 Oct 2016 22:51:11 +0300 (EEST) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=overt.org; q=dns/txt; s=k1; t=1477511473; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=qxnjUHhR5AX0uamrplFAV5uZ4NO5KR5FcqTAqk0F8Wc=; b=IHhlkkoIPrT/No86p4bGJizf4G39QJVPcTAYzk4EeQItnkfOg4GPoZPMx7PUhWLaIDVb4szx P4lB6cbHj1iZJ96NYXOT/R20v5GyZzE6clEMyf0bbCBZlTS4QP4IzTxLtqSzZ2c8T1z+tyVS L9xnLZICbV7UE6N4vxuZneRh7Xg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=overt.org; s=k1; q=dns; h=Sender: From: To: Cc: Subject: Date: Message-Id: In-Reply-To: References; b=etJ+aoBM1ge/vZ5pWKGFXnOsCMdjPIu8EfcI+hfHGv1zSOoTZbFfg8JREjvfdnjhNHGLGk 0EoHVgxjyrL4zJdXCaPjLdLlGRvgwB7UuZUKvRDpJQWqvR5W+ayhY0sSFM52aVpJIaQ1Abxc Yxgd4fhEEX1j8WP7EAnabCeBOjiDo= X-Mailgun-Sending-Ip: 209.61.151.224 X-Mailgun-Sid: WyIyM2Q3MCIsICJmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZyIsICI0YTg5NjEiXQ== Received: from mail.overt.org (155.208.178.107.bc.googleusercontent.com [107.178.208.155]) by mxa.mailgun.org with ESMTP id 581106b5.7f570c0500d8-in07; Wed, 26 Oct 2016 19:40:37 -0000 (UTC) Received: from authenticated-user (mail.overt.org [107.178.208.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id 8ECDA62146; Wed, 26 Oct 2016 19:40:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1477510836; bh=LQIa7R31kf9rMNe/icawWASCitceTQoj5OKKPVV2KiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bBHttNBmXRgupm5cBUBzKCN4t17Xgo8ZQWiWCgCApRYC5+WWAt0g65YlbzZzMylie nCtcDHBeTnn0tbOLkJWriud6N2cv99aqv9PrplvgTSk8Vu0uC49Fj19P4nDSDrafCu BUd6bq+ZfC0/HE2oYiqraXo35DfacrRS9AHkDnM18eXCIVb9U9Fd7+lTmQEjtVMe7a yj9Ki5PzY45UoF1SPMtNFEfcYgEatUMWTzLVwauCo++3lu4CJQu35CURtXOih3qBTs T6FK+Sy0L1CIo0oQSc8h2AdkOkF7nI6O4zIBx1AJUDZLSuPdJmzdHJNsghZb35yL4J XVx8EwuQDXhnA== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Oct 2016 12:40:25 -0700 Message-Id: <20161026194028.26438-8-philipl@overt.org> In-Reply-To: <20161026194028.26438-1-philipl@overt.org> References: <20161026194028.26438-1-philipl@overt.org> Subject: [FFmpeg-devel] [PATCH 07/10] crystalhd: Keep NOPTS_VALUE so we know it's not there. 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: Philip Langdale MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Philip Langdale --- libavcodec/crystalhd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index b68701a..4ac138c 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -848,8 +848,7 @@ static int crystalhd_decode_packet(AVCodecContext *avctx, const AVPacket *avpkt) * avoiding mangling so we need to build a mapping to values * we know will not be mangled. */ - int64_t safe_pts = avpkt->pts == AV_NOPTS_VALUE ? 0 : avpkt->pts; - uint64_t pts = opaque_list_push(priv, safe_pts); + uint64_t pts = opaque_list_push(priv, avpkt->pts); if (!pts) { ret = AVERROR(ENOMEM); goto exit;