From patchwork Wed Oct 26 19:43:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 1181 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp217171vsd; Wed, 26 Oct 2016 12:43:37 -0700 (PDT) X-Received: by 10.194.176.162 with SMTP id cj2mr3501711wjc.25.1477511017409; Wed, 26 Oct 2016 12:43:37 -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 o2si4377832wja.262.2016.10.26.12.43.36; Wed, 26 Oct 2016 12:43:37 -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=@jkqxz-net.20150623.gappssmtp.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 1F0B0689D1C; Wed, 26 Oct 2016 22:43:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B79A8689DDD for ; Wed, 26 Oct 2016 22:43:25 +0300 (EEST) Received: by mail-wm0-f50.google.com with SMTP id 140so35150074wmv.0 for ; Wed, 26 Oct 2016 12:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=/3WBoTUHcE13alr+CMYX7GO1yXA/am5WtjF68fyR7XA=; b=pmWUfZFovCgbg9nYC1BEC52bLyACCpSLRX4Udm0zO/efmv4RJI/H/2M/3WqIcLdXfm Q0CTEaa4D+re4tfpfzPo2uE9Kc6kC8nMpFcGeOcifqgfJ945b+t+fpHB7nCndpp05p77 KkeC62uuHudvMqTyLVMm6LAc87R00BVyMktE5za19Yys8wKEwRm/yoJFe7bzSDULebtc oL4kZRpDxDsGKBSPVqLXyRPOYo6lfh2qs7phF3psiebsJlQ5kZG6zNZlxqTnjOzELxIB YDI8utQOrhezf58XVbSy6fMrTl+fiqGa7xxZ3JeZf8X8BtTKII63NXiysq+jH0S5Ww8x Wi0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=/3WBoTUHcE13alr+CMYX7GO1yXA/am5WtjF68fyR7XA=; b=Dl2QMr28HBzqCUwVYLk+Cn8TJkNJPoYxxkM4pWWl8Y2D59mK2YCbEzxt9SpjHLfUAD NME33OGX8sxhFovA5/Zib4P9VWnWDbkAAW/yaXAUEsBjWJfgp2zwQRX983g6nrBmZp4V aIZKeWnvTsILE6DAsvgzJSQqQEnzmpZ3Xsbotx9SXp0Rl6+nYioGwtUrV4NrIoCxHicd enkerOJbiUuFBk5BKVFXRcyUzKYVDJhsXVxvfO1ZGsYsPzPstjlhe1SW4m7LV1ru+syb lhzDmE2FLr7AlXytcRscy/D8FORpTO1cJ9fXEmYch0MdDZK1DuzLvUSZZf7c0ZWQxTVu Hzgw== X-Gm-Message-State: ABUngvdUw2G5n7d4BrIXR5SPCrrJfS+lrCyJ2lzZ2vuWogjiY3QWU97dhYH990xc7KI18w== X-Received: by 10.194.248.43 with SMTP id yj11mr3602025wjc.81.1477511008246; Wed, 26 Oct 2016 12:43:28 -0700 (PDT) Received: from [192.168.0.7] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id a7sm4296775wjj.22.2016.10.26.12.43.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Oct 2016 12:43:27 -0700 (PDT) To: FFmpeg development discussions and patches References: From: Mark Thompson Message-ID: Date: Wed, 26 Oct 2016 20:43:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: Subject: [FFmpeg-devel] [PATCH 3/4] mpeg2video: Return correct coded frame sizes from parser 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/mpegvideo_parser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index 206f268..de70cd5 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -168,8 +168,10 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, if (pix_fmt != AV_PIX_FMT_NONE) { s->format = pix_fmt; - s->width = s->coded_width = pc->width; - s->height = s->coded_height = pc->height; + s->width = pc->width; + s->height = pc->height; + s->coded_width = FFALIGN(pc->width, 16); + s->coded_height = FFALIGN(pc->height, 16); } #if FF_API_AVCTX_TIMEBASE