From patchwork Wed Mar 22 09:41:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 3062 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp227331vsy; Wed, 22 Mar 2017 02:48:55 -0700 (PDT) X-Received: by 10.223.178.239 with SMTP id g102mr33136952wrd.126.1490176135620; Wed, 22 Mar 2017 02:48:55 -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 b49si1333575wra.308.2017.03.22.02.48.55; Wed, 22 Mar 2017 02:48:55 -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 03E2C6891FB; Wed, 22 Mar 2017 11:48:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E3A3688336 for ; Wed, 22 Mar 2017 11:48:27 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id u108so25950370wrb.2 for ; Wed, 22 Mar 2017 02:48: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=eXJ1xHh8YQ//+YXlwmQ0Wp5T85QYaFwCrt2UMddis4s=; b=cciNyEv04CQ+w89GBE0gekdqNJlgrav+d5p9OswJijcfPhnfQYOwj31qTEPw+sg/an LHKuZKcNteyama7wVd1mwXKMdqy0hPLCwVBGImyHwrfmxNFwQQTcYVYjZjbS6F/4JNBt ySYCrAJbcMvvUkwSL8LlGpQYt7CzeLrm6wTgdWcdtUy6bd2fm6JqYEIbD+jZmm7OlREQ OjHdM6swuf3/VUKfmeL6GyhOWYNJcEsHYt0G1oZJnmbvwfbRZV1fCxKBxnX0VNcw+W5Y BHhvgCMpTFI7P1+1271TeSCJdSTvurRJZ8zhqXgM2pqwegaC4IhlCbfbJYtceC6zKnqa jLaw== 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=eXJ1xHh8YQ//+YXlwmQ0Wp5T85QYaFwCrt2UMddis4s=; b=Hdx1YclD9lNMP83qkTS+yVwSMvwNrsVy0jXEalSijL5i+4VcMQjw0JBj0FyndUH0pe 5Aee0fOgLz/NmtnYq19qkB2MxTD5KpA9nPa6YuMw+qnPybWu9+IvhM3RZxrexuvKzycW DQJfOuNZmTyVmyOgWoyU94DM5IMaVkbuy0TMwLXoPBwrV5Htm1glklJY29tbPRRqPzGh rlxJ+UuQAX9jZsKFCtu9Rj2Uo/05aa4JQBIsUDM+rllgYwJbeCATT4jM1LJs9LTP5GT7 p6XetXmT9gEUl4wyvDK++s9VpS149vK27dZI2HoM2FLffMV9/g+MjpcqFwGLwLVgGdbT T5fw== X-Gm-Message-State: AFeK/H2vUYwjgWMXKlBJsiPejgSC84e/YZMOIGDFD49GjPIeNFmtIrAsUQOD/jfl2IbZ+w== X-Received: by 10.223.168.43 with SMTP id l40mr34776447wrc.150.1490175709486; Wed, 22 Mar 2017 02:41:49 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c000ea900596bc7dc9239b9f6.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:596b:c7dc:9239:b9f6]) by smtp.gmail.com with ESMTPSA id u7sm1112040wru.56.2017.03.22.02.41.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Mar 2017 02:41:48 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Mar 2017 10:41:36 +0100 Message-Id: <20170322094137.8108-1-robux4@gmail.com> X-Mailer: git-send-email 2.11.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mpeg12dec: set the coded dimensions with proper alignement 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" --- libavcodec/mpeg12dec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index e49167f89e..55fcac0cb2 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1291,12 +1291,11 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) } if ((s1->mpeg_enc_ctx_allocated == 0) || - avctx->coded_width != s->width || - avctx->coded_height != s->height || + avctx->coded_width != FFALIGN(s->width, 16) || + avctx->coded_height != FFALIGN(s->height, s->progressive_sequence ? 16 : 32) || s1->save_width != s->width || s1->save_height != s->height || av_cmp_q(s1->save_aspect, s->avctx->sample_aspect_ratio) || - (s1->save_progressive_seq != s->progressive_sequence && FFALIGN(s->height, 16) != FFALIGN(s->height, 32)) || 0) { if (s1->mpeg_enc_ctx_allocated) { ParseContext pc = s->parse_context; @@ -1310,6 +1309,9 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) if (ret < 0) return ret; + avctx->coded_width = FFALIGN(avctx->coded_width, 16); + avctx->coded_height = FFALIGN(avctx->coded_height, s->progressive_sequence ? 16: 32); + if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->bit_rate) { avctx->rc_max_rate = s->bit_rate; } else if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && s->bit_rate &&