From patchwork Mon May 1 23:32:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3538 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1617100vsd; Mon, 1 May 2017 16:33:56 -0700 (PDT) X-Received: by 10.28.127.85 with SMTP id a82mr956663wmd.105.1493681636869; Mon, 01 May 2017 16:33:56 -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 h191si10778574wmd.19.2017.05.01.16.33.56; Mon, 01 May 2017 16:33:56 -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=@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 sp=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 B56E368921C; Tue, 2 May 2017 02:33:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 719C5688381 for ; Tue, 2 May 2017 02:33:42 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id g60so287980qtd.1 for ; Mon, 01 May 2017 16:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=8zll2VPdhoebVzByf9a0dg8QT6kCRxBfFCyVAhf5axY=; b=N49bABKgH5n+ODrsFvMjLnFZzIJi2cYdQ9kQixWkkuerr1wgRj4AADdw0EvvzIAOsU h3Ab6Sx0PMhP18w7OWS+t3hLzFo4ki/FrEGnscHpRI6miel+5UXBxObvxVy3Fm0STL7u z8pmD9Q2yRdtTVp7+jkl7Tk9+MTAlMNXoh9as8dQ94/goifLLmj4ZnPA58BzIRs4GRFt JvX8nSYRrbn1aGMbdQ5GOmZBbY3kjZrcr86BQOEnKGpcWuJdCzJVjCLG2oBm9Be+pxli QfKzyK2Nftzd4H8cI1UedGkbGZLCDjjL3jYmm8SGOlfxDq6Bo57yjOd0KUQGbautyWGb U4zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=8zll2VPdhoebVzByf9a0dg8QT6kCRxBfFCyVAhf5axY=; b=GybaoeDUNXU6tZAt11uPPkQND5dcgHmU49jtKOeCo2aoQExOEzpizTMwsO/ryr5jFs TUmChBYec3DC6uSvPnKEI+ARsLL1YpQfWx5FPYOUUXf2jAjWXj3vq76BTbkFTGisyfNk zNHjqu+IDBFTvQ2Zxmfkk5QJMZIMIVC86xyH4T8RoG2I5o0bhNqmt2IxOJFtbm/QXxkF tGFBltXd5WDflJScuFg/GE9wdvFzX7614EQCD62knw7EHhlYLAbRGLPxpI8qIdy87AnZ KM9L98J7mM4iN8kqpXpe00f+WMQ5lbYoFNjdV9YGSvco0iU6IRAu2JtjVzBcfb9caWxR iOmQ== X-Gm-Message-State: AN3rC/7OD/aNwzwtOpY85EMvKvYxO0LAFlI8pvOCal78nv42SHXAqv2N Qb5tttyOYFS2Z0BT X-Received: by 10.200.45.167 with SMTP id p36mr27358277qta.265.1493681624858; Mon, 01 May 2017 16:33:44 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id f7sm11192788qtb.30.2017.05.01.16.33.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 May 2017 16:33:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 May 2017 20:32:47 -0300 Message-Id: <20170501233247.4876-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: also check for FF_CODEC_CAP_SETS_PKT_DTS in audio decoders 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: James Almer --- libavcodec/decode.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index edfae5583c..a54653f5a0 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -413,9 +413,9 @@ FF_ENABLE_DEPRECATION_WARNINGS } else { ret = avctx->codec->decode(avctx, frame, &got_frame, &tmp); + if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) + frame->pkt_dts = pkt->dts; if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { - if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) - frame->pkt_dts = pkt->dts; if(!avctx->has_b_frames) frame->pkt_pos = pkt->pos; //FIXME these should be under if(!avctx->has_b_frames) @@ -426,8 +426,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (!frame->height) frame->height = avctx->height; if (frame->format == AV_PIX_FMT_NONE) frame->format = avctx->pix_fmt; } - } else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { - frame->pkt_dts = pkt->dts; } } emms_c();