From patchwork Sun Oct 23 17:56:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 1152 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1862301vsd; Sun, 23 Oct 2016 11:04:48 -0700 (PDT) X-Received: by 10.28.222.10 with SMTP id v10mr18036823wmg.111.1477245888061; Sun, 23 Oct 2016 11:04:48 -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 y204si8368203wmg.81.2016.10.23.11.04.47; Sun, 23 Oct 2016 11:04:48 -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 D2E4F689CB6; Sun, 23 Oct 2016 21:04:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 280F0689AA2 for ; Sun, 23 Oct 2016 21:04:37 +0300 (EEST) Received: by mail-wm0-f45.google.com with SMTP id f193so10504797wmg.1 for ; Sun, 23 Oct 2016 11:04:40 -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=DDT70KnyRFL+7/gcsDu+i5TguNNxNOmQiMy/AH6XnZI=; b=AkvFOMHItwfM7tuw7svFuMtc75pIzCbh0h7yeutiX5NOLIlkZ1qmCeCPWJRKmh8mKZ vCUpkdJ1m4niODVbUZrq/lfEHzdbNuQn+yArPOlNAtmgF1bNr4QGyKnHPvo2If+mTyMw 5sMEVwJpmWG1cdp2QfNhded58U+DKhkJRW7szNbIoOV9YdfzKdSWMG3N3FdLLN01/bPC bwmZbNHjOKqGbWsXVuQ8aSe4QIqeSgPVh7xFAOOuPifngW6VFun9/5IgJ7tve0cREGsO 4lP5zzHxD7/a0hWgZ9Z5KoiSKO/fG2UvODcGb/YgdNdAfnS9V84qH7wDvXmAUy6InEPk fWLw== 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=DDT70KnyRFL+7/gcsDu+i5TguNNxNOmQiMy/AH6XnZI=; b=e+iLDkgY8GICOuGyyXmH7i10LU9FkAxBOP5SY2QiTGRhLIZvBcwj8/RwgRmsIdN+eO NkFZZ63hop58bgV0b191MP5kgqop+Upt10zWmtHel6G9dPS9VCnFnTc/W94HnReMO3Nm yTFOi2zwagDezutVg4lnhEQOt3JgOAXISny9oA5HYJw0sHU1jObcyyRmwTTfwq0YKq6v oPQSOEcTlpdHwt7zluPdc2XLuVFDtjO/6UoNyUXepd6TEsDqN7O3uVgQp+56lvQEBz9u 9Ps0JjAOkW1l7gRhouNCIZl7Zau9sTX5V7StxRBm3hdPirse5OOanq5W0quaZYqk0UDK itPA== X-Gm-Message-State: AA6/9Rnwo7WXMt5qc7ykhEY70jTGB8ObKaAuxA+AeMWDlSR1iALVdOEjcLVKUtGpHpZFmg== X-Received: by 10.28.141.72 with SMTP id p69mr11125150wmd.66.1477245388520; Sun, 23 Oct 2016 10:56: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 p9sm14937767wjs.11.2016.10.23.10.56.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Oct 2016 10:56:27 -0700 (PDT) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: Date: Sun, 23 Oct 2016 18:56:24 +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/2] 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" --- This is required by the vc1_qsv decoder in the following patch. 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,