From patchwork Wed Dec 6 22:54:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 6570 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp7559469jah; Wed, 6 Dec 2017 15:01:44 -0800 (PST) X-Google-Smtp-Source: AGs4zMbXKWb4OKTGwh1D0TI6N7LtBEt7nHZ5I/ypEK9BA6O3CxfTtwFQo2pZe1iCYKDgc2oK1x9X X-Received: by 10.223.142.143 with SMTP id q15mr22705037wrb.6.1512601304437; Wed, 06 Dec 2017 15:01:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512601304; cv=none; d=google.com; s=arc-20160816; b=wAN7shBt2VqSWVmmIuOiJ6DqRgN68nc/ZedbOBn2BjzcUl2+cMy+iEywJzeeO3m/TX oALxbL3qbksLmZX08/a0+wB1LKRUqUSRgyYMprXwalRNhlmLyPBqEZgMCob1YpCDyh8s I3OA51qVVeUxyeUPq3LAklIWddYR7+MFgkpD8EjqDBJBvFV0QLvvCZ83EMp039X5CAQQ MSzx7TqLGdxb7MMr92KuXSoZQ4nkE8Y24CobTHe+jAhW57jHg23Xkqy+vvC7j3qARhuI iqwpYA8NT+uF1H11T3mFPjCEaC4PpWCL3r0SkNoBvtKhNAb3KeO2mJpu68Uq6ARAN7Ae zCVg== 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:dkim-signature :delivered-to:arc-authentication-results; bh=zWaVuT5bJoe08sJHv4CuZxE+jS1oHQsw7SAjjhPRk0w=; b=wfurqAYRxUghGeWN6MpxqmqvNDP3E6JqR2jcdO6+oY2gBT7dDQKTMjU9Ok3lGcVao/ y2msSkpZb23HeOQpNB3UV+V31yUSWUIGAkdSvYLd3YF6HOhsXMAqXZJUZ/N4jT2Q8Wn2 ch423phNjiUuGz0qouFNt+Z+662rWgQNkBPWaV/9LrpQmxEaZGwZ7lGRUvxYTUat5ONH 89uDxwyE/cbx3n8xW/dN1ORVKtquvLdJPLAmpiFA82UWCDuQrDN4+vWUYuicKHaR2dS7 7zifO51BIpZI8R6F1bmAULfkL+px48tzrimO2SHHcDdzVP4hVrxVvIRDHhgJB0uIwTfd L+gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=E1I7/qve; 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 b11si2804138wrf.245.2017.12.06.15.01.42; Wed, 06 Dec 2017 15:01:44 -0800 (PST) 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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=E1I7/qve; 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 04EA5689E03; Thu, 7 Dec 2017 01:01:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D958D6882B7 for ; Thu, 7 Dec 2017 01:01:28 +0200 (EET) Received: by mail-pf0-f171.google.com with SMTP id v26so3167466pfl.7 for ; Wed, 06 Dec 2017 15:01:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=IfHuLwZXtyZ2pPT0txMaTWPq8fXFz7Rd1UqCoM3PVrg=; b=E1I7/qveg9ywPt1USjIDETEy4fvenu8Syh+sw+2WJgzs8g9Qoac+aeExY+OT3rXhzK sG4KBb7+7HZJK0CvCnipxZBAy6fU25/6toXa4390SaLzqtfynw4yQldKktxYoDuIgnJS 9JzcjJLuo9wVnhC2q3t/dCEuUKrkcE3kkNnAp8yfnWL9eI7/WKYSXYPMFzM9vRJWxme2 hcQtiwVGayQ1n8A8C62GKOU9aJO8W/JadipmuGYyln8oCF1BiTOC73ml5QjTKYvmFMdx tYx8IV3MkX3I02DMz20jHndotnBoqXcbkTp1zoB66ZqycyecF7o8yh7mB0r2dUvSHEid N9nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=IfHuLwZXtyZ2pPT0txMaTWPq8fXFz7Rd1UqCoM3PVrg=; b=sc0cgnDMhI02x5p/K+hJWkF03L7kjiYepL2gDlg2HHB5WbRgW0g2pQkMVX7ORM57Eu kD7xo+Po35f9sHTTm06adcpxOPSQdA4FlTLckUi8LhvBy75Q5RRKYHInNGaKgfWkevUj nZJZ60cowmFqW3WtOWmO2dbkL+Qlb6IFaA/qOyK+jSStQKjrQHTrEs64sGIruHrTLNaB G+g+t6tvOJi2qd052Hnz1n7JwJ0cImxzT0wgcUl7XreJW7dFIneRcGzna14vT6AXjaQN uheNajaqWhtHyYryEK1p0CuYkCBDakdTQxybNtJtN20Qjr+bTjTZpDye8G5O1tABYnPz Q1XQ== X-Gm-Message-State: AJaThX6D4GoHBfqLhStkiLdzr6c/8NLvO6wwl/NVFNtutQ1T9IJsxtSo cxTJxutszRFB2QY0A+v2R00dwkQP X-Received: by 10.84.206.37 with SMTP id f34mr22806335ple.299.1512600893233; Wed, 06 Dec 2017 14:54:53 -0800 (PST) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id p87sm6674873pfi.95.2017.12.06.14.54.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Dec 2017 14:54:52 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Dec 2017 14:54:50 -0800 Message-Id: <20171206225450.92658-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] libavcodec/mpegvideo_parser: set field_order correctly for progressive mpeg2 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: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- libavcodec/mpegvideo_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index de70cd5632..be240b6890 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -131,7 +131,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, } } - if (!pc->progressive_sequence) { + if (!pc->progressive_sequence && !progressive_frame) { if (top_field_first) s->field_order = AV_FIELD_TT; else