From patchwork Wed Oct 12 19:54:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 978 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp25581vsd; Wed, 12 Oct 2016 13:12:07 -0700 (PDT) X-Received: by 10.194.179.170 with SMTP id dh10mr4034889wjc.94.1476303126999; Wed, 12 Oct 2016 13:12:06 -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 vv3si12478133wjb.70.2016.10.12.13.12.06; Wed, 12 Oct 2016 13:12:06 -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 6BA036897C0; Wed, 12 Oct 2016 23:12:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f193.google.com (mail-yw0-f193.google.com [209.85.161.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E95D9680D56 for ; Wed, 12 Oct 2016 23:11:57 +0300 (EEST) Received: by mail-yw0-f193.google.com with SMTP id e5so2275629ywc.3 for ; Wed, 12 Oct 2016 13:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=qwvfYz8SNIRSldWGYxzh7xcd37WWiuDI1g/TX8v/0fo=; b=mN4P9FqZ9M4AZiZ8Kfcv0RmfQk14VdI9pcxKg+bA31XYtZYlxtnyxIHxAK2433mo0v 2VHRKduzgfIQ+9GQv1Ja18aZxNQB16bAtgdDjYyQRQHMrhDt5U5GgpZfqAZu2/P8ydLF fh35QKDsuhNp/zTbiRQZj6+vedt0aWqL9/y57Mb+zzRNDmmVn0mi9zejAHck0LC90wOI rqRVS4pEqcdFv/49ppz1SYm3+EOKD8ztOUF4Vttsidw9yovpvfaM+/NWhEF6p/pnDl7G cHFRj6HHUYOIVwJn+sjiOR82heavRGuO8m9Yb7BQAjCqovs1MYP8Rml+Kahc2zNKUvvD xZWw== 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; bh=qwvfYz8SNIRSldWGYxzh7xcd37WWiuDI1g/TX8v/0fo=; b=JBP6+rcCfsKcmcLgf9mkSBNnl2NKQaroF0UhJXZgqh2fotTnODoXDifK/G9lc1R3tF Mam4WwVlynRPgZ+4f95nRExwkiQcVfXrCz+58XqJzIZDAoEvJlMn6eYSuMxtmPylZaDY Z3/y8qOLGtRoWJd4STvjHJ7+Eq+Pk98KhmU4mG9BBAvEP7YsGOUzbUzE3r45K65kfI1k Vhsx27PWaeK8GP6yfTnYwcmzyw2asRj1ELUZuFiyymmGSBM/zilMk3ExgXsKJTsy6Cl+ OVwj8sH92cRPJSweIahZXsTGQGiqaYyae85NPx9fsqqM04cNQrgnqXqa1fQHiHQ2yMkf ivqw== X-Gm-Message-State: AA6/9Rn/nE86NslaMS7h8cRdsqKdoHiONtjBTDLCaS+GWpnIqn0B/aTevVbWGEgDlNyfcQ== X-Received: by 10.13.235.16 with SMTP id u16mr2554761ywe.323.1476302139478; Wed, 12 Oct 2016 12:55:39 -0700 (PDT) Received: from localhost.localdomain ([181.22.66.211]) by smtp.gmail.com with ESMTPSA id m75sm3361398ywd.52.2016.10.12.12.55.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Oct 2016 12:55:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Oct 2016 16:54:56 -0300 Message-Id: <20161012195456.1812-1-jamrial@gmail.com> X-Mailer: git-send-email 2.9.1 Subject: [FFmpeg-devel] [PATCH] avformat/matroska: fix MatroskaVideoFieldOrder enum values 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" The spec says 9: Interlaced with bottom field displayed first and top field stored first 14: Interlaced with top field displayed first and bottom field stored first And avcodec.h states AV_FIELD_TB, //< Top coded first, bottom displayed first AV_FIELD_BT, //< Bottom coded first, top displayed first Signed-off-by: James Almer --- libavformat/matroska.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 1ff76e6..15e401c 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -286,8 +286,8 @@ typedef enum { MATROSKA_VIDEO_FIELDORDER_UNDETERMINED = 2, MATROSKA_VIDEO_FIELDORDER_TT = 1, MATROSKA_VIDEO_FIELDORDER_BB = 6, - MATROSKA_VIDEO_FIELDORDER_BT = 9, - MATROSKA_VIDEO_FIELDORDER_TB = 14, + MATROSKA_VIDEO_FIELDORDER_TB = 9, + MATROSKA_VIDEO_FIELDORDER_BT = 14, } MatroskaVideoFieldOrder; typedef enum {