From patchwork Tue Sep 27 18:03:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 750 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2611407vsd; Tue, 27 Sep 2016 11:04:33 -0700 (PDT) X-Received: by 10.28.64.86 with SMTP id n83mr4269233wma.127.1474999473269; Tue, 27 Sep 2016 11:04:33 -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 t64si4057665wma.117.2016.09.27.11.04.31; Tue, 27 Sep 2016 11:04:33 -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 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 E3A20689C9E; Tue, 27 Sep 2016 21:04:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3BFA680A7E for ; Tue, 27 Sep 2016 21:03:59 +0300 (EEST) Received: by mail-oi0-f65.google.com with SMTP id w11so1366992oia.0 for ; Tue, 27 Sep 2016 11:04:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=hCN866R8RH440hx+GPW//uTf0nWnBZqzZy2jUe5sUT4=; b=fx4iULE1Nser4dNorCGy4yIQvdasRaYxpRVb4oGnhumkMXkkB1gmYwyQPrWsJ1ch1E prfbiQ0/isgXLVKKRWTfma2F9e9fv5LU/Q39s10Ong2N6yT7zpJTcLGVNF0+alQVTJ6Q UEL3ax592JqFbS+7yLimcdrjn660OdfqrdQDXHh6nrsr77xDlOH+UsNDxLxQ6Yg+XjAo JUXw+tj0XWJYsnTfJoe9GAtDnI2aNw/0mVaWkqrZV3Q5qcsNOcBbXoSSLi4ZFbWCKziD mNkJ/WJtSt5Tj1K/GsdPljfQSeg+UIJmZy33fXMVjzpPb8rA9nxsKUScpkxbs410ggcL TydQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=hCN866R8RH440hx+GPW//uTf0nWnBZqzZy2jUe5sUT4=; b=NvdhGefxmg+VFiKzagpl1/CeI3GHWis0NSz8rSxu8P2DpZ1Ld6R+Bxw8HfN/t7NA2B iW9Q+jU5Z807fMa/6syAy1AB3NzmiFf+CxaFBogC7EbWMWxicWh45OcKtJ89QdIXYUaA 2qh6yEMOAm1G8gvAM8vqsy4p48ahJbVpPBQeP47var9ngC6P9qr9A4PbteI8tvp6k3bu /IglMuDUtXWhbm35dTKgoaTIqsovB1k0r4eBNLY0ZOs55y5J1/sg3MzZRxcxcJEoi1ld PvLLQOICGVLzSsowkh0a4FFOk+GIXYNrQc68FMDdp7J6N3n53lgs2Tw0GfrVNSsgpsN6 oCRA== X-Gm-Message-State: AE9vXwNnDAH1sEz55p0RGxdAdx47MmJ5+lgd+HIoOcjhLPjXrAtKsix5RhFk3Jobokn+Bw== X-Received: by 10.202.237.208 with SMTP id l199mr36169724oih.167.1474999450473; Tue, 27 Sep 2016 11:04:10 -0700 (PDT) Received: from localhost.localdomain ([181.22.0.151]) by smtp.gmail.com with ESMTPSA id k23sm1027101otd.30.2016.09.27.11.04.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Sep 2016 11:04:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Sep 2016 15:03:05 -0300 Message-Id: <20160927180305.6132-3-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 In-Reply-To: <20160927180305.6132-1-jamrial@gmail.com> References: <20160927180305.6132-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avformat/matroskadec: set AVCodecParameters.field_order on progressive video 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 --- libavformat/matroskadec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 77b8a5d..2317024 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2279,6 +2279,8 @@ static int matroska_parse_tracks(AVFormatContext *s) if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_INTERLACED) st->codecpar->field_order = mkv_field_order(track->video.field_order); + else if (track->video.interlaced == MATROSKA_VIDEO_INTERLACE_FLAG_PROGRESSIVE) + st->codecpar->field_order = AV_FIELD_PROGRESSIVE; if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREOMODE_TYPE_NB) mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul);