From patchwork Wed Oct 26 19:42:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 1180 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp216748vsd; Wed, 26 Oct 2016 12:42:32 -0700 (PDT) X-Received: by 10.194.201.36 with SMTP id jx4mr3545005wjc.38.1477510952801; Wed, 26 Oct 2016 12:42:32 -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 uq10si4389750wjb.198.2016.10.26.12.42.31; Wed, 26 Oct 2016 12:42:32 -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 93A58689E17; Wed, 26 Oct 2016 22:42:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44A69689C57 for ; Wed, 26 Oct 2016 22:42:24 +0300 (EEST) Received: by mail-wm0-f47.google.com with SMTP id b80so244195372wme.1 for ; Wed, 26 Oct 2016 12:42:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=kxPfAGNVi5HOuwlVOMajkaTWVpGRdTQYy/3N0cNAyvY=; b=S4UHzOV7UakR5h563c19FfDoyPSLAKN0i31pwhPPtEMvFVfzSSAAOUhU68B8DSLi/Z cP/Ml6W11AsGlmTuyMrKSJn+JsmUyjeCLPiQlYm+DVOEPtU8TK1CRqc6WPhufdDosaqJ dX323cqXSmURmhYdWjuJfqYr+FHxfrJ8IhQi4dPAdlBmJYnu+bWwzDvyo0ileFgXGg6L DtdW7sCLenx1zI+gBZd/pH+L+O0jO22e0VwR/kLurrQ22sMz9VFXOBy5pw9jNaUPh5EB lLdPN6f/gQXJGJ5pNyqt2IdhW++VBtwF6FN2I0Pn9EckI6P2UC9aarKvDUu3Ja5H6FEO 6LvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=kxPfAGNVi5HOuwlVOMajkaTWVpGRdTQYy/3N0cNAyvY=; b=AfqHgVwnsZc3OXL7Jx4+s/7M+tM/ZtmpgWN+sfF480MikcvRqhQzvfNj9L2BfL6604 ONoCqoWliU+wKTHvxXY9wtanRuWMYSaIhCgM6DWaJYrAqT7d+C60a/XGMXi8BcnhwWbz rT9sdhDNy6w26XAoBYNZAOx87iBg5B24KLhLHO16rBnAYZbC5bStluHpmlFPQ+Rptl1r LKfprDYjcQuV6w2hO60rUFwVXNvnOGmApLA9LpZMWMAcc1xMIHi7ukuvrwl+zgdCd2Vl HXP5Eax7CtGS5/EicUt/xKXW2LCdLXnXf5A8MzhN2xHHnWlxDQVoaWPk4YCwJub9Au8U 3smw== X-Gm-Message-State: ABUngve2vVi6p3O9u4WQWhKKPwo5G7bUJKSGq7Ui488Vk9FYfym3FRi5a3dVz/p04OUfrQ== X-Received: by 10.28.74.216 with SMTP id n85mr10976786wmi.39.1477510946687; Wed, 26 Oct 2016 12:42:26 -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 w203sm11227634wmw.16.2016.10.26.12.42.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Oct 2016 12:42:26 -0700 (PDT) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: Date: Wed, 26 Oct 2016 20:42:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] vc1: Return stream format information 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/vc1_parser.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c index 9ca6154..bb54947 100644 --- a/libavcodec/vc1_parser.c +++ b/libavcodec/vc1_parser.c @@ -115,6 +115,14 @@ static void vc1_extract_header(AVCodecParserContext *s, AVCodecContext *avctx, } if (avctx->framerate.num) avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); + s->format = vpc->v.chromaformat == 1 ? AV_PIX_FMT_YUV420P + : AV_PIX_FMT_NONE; + if (avctx->width && avctx->height) { + s->width = avctx->width; + s->height = avctx->height; + s->coded_width = FFALIGN(avctx->coded_width, 16); + s->coded_height = FFALIGN(avctx->coded_height, 16); + } } static int vc1_parse(AVCodecParserContext *s,