From patchwork Thu May 24 20:27:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 9075 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp484249jad; Thu, 24 May 2018 13:27:34 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqYGwzSFdG85ejZIU9poNONgiwbFrDJVh/pVyyrGlLoZdOBiDcoxYfU0t9w0wZ+2BL9H72N X-Received: by 2002:a1c:8e95:: with SMTP id q143-v6mr8076285wmd.161.1527193654059; Thu, 24 May 2018 13:27:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527193654; cv=none; d=google.com; s=arc-20160816; b=FA138bW/QVMG38m94PAQ8iym7G3t2eCH6lmlT1l7GDkjCTCQOhCHInU+8bDzEOkrAQ oZGNeCZI23DlJgC+93hvusEK9+t3HzLkA8dkiD/j05Y5QQI51f/bssIddZBN2BEkNmMO Vm5avpGIBNEu6lrmVfPwdjLkaauMEPcl4slJ3cxssd83gTrD1PzT3FjsiN6RhwzXG2DP 92OvcxyXcxiWWQUVEolZFo/iqT/cMDpiwhwUr0tkZ+ywXaydvTpcJjDwdt+k05o2vopf zmJ4BdlOxtJwllSNCKkt4VaI89tGC3vuUcitoDee/ZYl8ViVtSrBOYtlZKdO4JB4DyQr UPNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=n+e3YWRiT1tING2IVe8pnKYPRL/7bLIT66pFy51ZZDE=; b=g/EYqOFtb770IIY9MWTqKG4M0gZ2EGQ+MgoFKK/u1SsK6MlCWmg9LdCH4lvmfDYR4M PltYW3qFVidyWTnHNUd4kG1uRyRiaxGD2VC243HSRurdMREgUMVEkE+jG+cgOUlS62lD xjUa+wy2OMcmN11d+pzAe1YdKwL78oXyWjX05U+BpGPK4GGdcCFlwY+nLZPq3+i9CTDM E0AL4khnXfmw5Eom24vC/P04K6h0o4oI807lLWvQMelHwgSe13b6k9oZVHU40tMEjhRT sIKagqnCQ59K1OhS8hQNRs1f+jOzq7ns07/eS23C6nmk7Y5RNKXY4rsuZlhZ2S7SE9vF llVA== ARC-Authentication-Results: i=1; mx.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f14-v6si1320548wrm.374.2018.05.24.13.27.33; Thu, 24 May 2018 13:27:34 -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; 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 6904568A092; Thu, 24 May 2018 23:26:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49BDF689DE7 for ; Thu, 24 May 2018 23:26:43 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 1BEDCE0FC6; Thu, 24 May 2018 22:27:25 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ofig3oVhKpe5; Thu, 24 May 2018 22:27:24 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id CAB4EE0E11; Thu, 24 May 2018 22:27:23 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 May 2018 22:27:14 +0200 Message-Id: <20180524202714.16784-1-cus@passwd.hu> X-Mailer: git-send-email 2.13.6 Subject: [FFmpeg-devel] [PATCH] avformat/mxf: fix NTSC 59.94 samples per frame layout 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" FFmbc uses this. bmx uses this. XAVC MXF Mapping and Operating Points prefers this. Basic rounding rules also yields these numbers. Signed-off-by: Marton Balint --- libavformat/mxf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxf.c b/libavformat/mxf.c index a909401f08..c8b57f7f0b 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -134,7 +134,7 @@ static const MXFSamplesPerFrame mxf_spf[] = { { { 1001, 24000 }, { 2002, 0, 0, 0, 0, 0 } }, // FILM 23.976 { { 1, 24}, { 2000, 0, 0, 0, 0, 0 } }, // FILM 24 { { 1001, 30000 }, { 1602, 1601, 1602, 1601, 1602, 0 } }, // NTSC 29.97 - { { 1001, 60000 }, { 801, 801, 801, 801, 800, 0 } }, // NTSC 59.94 + { { 1001, 60000 }, { 801, 801, 800, 801, 801, 0 } }, // NTSC 59.94 { { 1, 25 }, { 1920, 0, 0, 0, 0, 0 } }, // PAL 25 { { 1, 50 }, { 960, 0, 0, 0, 0, 0 } }, // PAL 50 { { 1, 60 }, { 800, 0, 0, 0, 0, 0 } },