From patchwork Mon Jun 19 15:10:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 4037 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp959207vsw; Mon, 19 Jun 2017 08:18:16 -0700 (PDT) X-Received: by 10.223.129.134 with SMTP id 6mr14118849wra.77.1497885496813; Mon, 19 Jun 2017 08:18:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497885496; cv=none; d=google.com; s=arc-20160816; b=mpaINTocPaoNkcIT/lCbbu7M82g63yd2e5ifX1iEkQYQaoKq64cNKPtle5IoEG4JEn 1oqrFhC+My2FlpE9NEYhV6SjbPrujMQ77BGD0aFy/euEBckMyFK3esOp8zMuvhEdpCOr 9jvqu+jX+NuW0wx+boNixC81Zu1w6nTxtjyJJWpBddM71+MsSNDqsVsY/+giMQ+33OEb 8L4+C8A9nT/GxtA8X1L20vGR21cgTLNGx6CsoK7wwel23kycRu25XYgOdkJpdE0ZH0HD 0WxnPir6/qa7kWYIDyHh3vnHifGjIS7mk2Zypr1PgXsT6Fo7+TtQrvLSRW3nr9XkQJ6/ s/Tw== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=xM9tnQZjyHZTMknOPqVq85UoBOQPbA5Cxo4XQRXou+Q=; b=u86rI5e1ViWL5u0e1dBYWv3GHyYth1k/LcEWJ7pa2Gjl8CqUDw6a9UaXtKNAkneB7X uTxAmx64u0A1K2NkAuNBTwM6OK87XBLdqbgIvj31/FXQxHYi1QukE7uKUC7RPgdoQE+b ijAEQQsGZgP67ucGh/Z+H/hV6Fsa+cQZKD2VGLxiFStqhwLwna1mHAVXy++je/Xo6B0S HtIdd/oUwpXraciMmsDnTWNISZfgrHyuK7dw7bO30c+c7neZPHQVF3HiIO9PqXU1ut90 Uu78ZZEyx14netE2b4Fd1q0u+fzPeiNMIXlnjmiOATyXyw6S7qtB2XWKgAPIPkS0wMb3 uyXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.b=TLIS/25a; 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 z14si10451857wrb.48.2017.06.19.08.18.16; Mon, 19 Jun 2017 08:18:16 -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=@ob-encoder-com.20150623.gappssmtp.com header.b=TLIS/25a; 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 161B368A4F8; Mon, 19 Jun 2017 18:17:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B977868A467 for ; Mon, 19 Jun 2017 18:17:35 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id 77so14065027wrb.3 for ; Mon, 19 Jun 2017 08:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=sF76443zEA7L7ww9HIlufmfsus4JHalXydHVTDcP8v0=; b=TLIS/25auUFawIizAEcKnqrjN9pvL2HqBybAUhASMbkCDP6imn4R29KbIDbovTtH+8 yuRXmOfqRpZ3HSoX6xu3rXoJ8SwCMoHnn2QuEgxVVOmOAwq2htuTuWFONjvdsOz3V1QD Lty6x8OsQdmp3MQ/FI8AirTsxdG1dC81nNLE7A3Xqo0EjAH0NvNQaVZSRTAIW6VdIrO7 lXpyGsYnEiK90PC55ImJmHiczlypLJigkijT+d1eRXsOMdIaCcsuAj7nC/0m/+baYYUw WLV/huLVyGOdlPojR7MFNr55TAqf77dCDtslNc5zdvSoFWZiYrWLpk/rfrhfovjNYbo+ AOJw== 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:subject:date:message-id :in-reply-to:references; bh=sF76443zEA7L7ww9HIlufmfsus4JHalXydHVTDcP8v0=; b=sh3zK6GSWoEmnxicaLjxEGSq9BGl7jAgqubI1HkKs7u/UuagWXcxsFgdpy8KtaPfBc WlRhmb02BdV/GpogDM3zen+2Iw6B+Q5ZwLdW2Kc1BZqdRISKxuDP0jIy7qobuEqX4LL8 JJBaWJuqoXV8xoNMeL/MY2/tSWtFCdSdIp6ksRFx7Ys/dLJF1Mwl/QTstFhYtS4jCcaf vD3Pvk1TAEeFJtMBpxgEWYcTNnxnenIGKIDrJCTXJB+VX6+ziA/SOPuHF1FKWAsiua+H d6BARaylh/FoO8HmnVZnI6W+qRxUBolKi3lzoNQA4izg0KXh9BCe1EMa6CbWcD40RNRn MLgA== X-Gm-Message-State: AKS2vOzH6g020+8BsLKiE2AZwiHYbCMnHHZfzF4x0u9sCmi+qgGamTkV Lft7jQKqFm/nxY9Ofx0= X-Received: by 10.223.129.134 with SMTP id 6mr14116689wra.77.1497885459973; Mon, 19 Jun 2017 08:17:39 -0700 (PDT) Received: from Ifrit.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id 6sm8059540wrg.61.2017.06.19.08.17.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 08:17:39 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Mon, 19 Jun 2017 17:10:56 +0200 Message-Id: <20170619151104.31273-4-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170619151104.31273-1-jdarnley@obe.tv> References: <20170619151104.31273-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 03/11] avcodec/mdec: override IDCT choice before initing DSP structs 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/mdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 8e28aa04f0..97bfebbeb7 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -213,6 +213,9 @@ static av_cold int decode_init(AVCodecContext *avctx) { MDECContext * const a = avctx->priv_data; + if (avctx->idct_algo == FF_IDCT_AUTO) + avctx->idct_algo = FF_IDCT_SIMPLE; + a->mb_width = (avctx->coded_width + 15) / 16; a->mb_height = (avctx->coded_height + 15) / 16; @@ -225,8 +228,6 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_init_scantable(a->idsp.idct_permutation, &a->scantable, ff_zigzag_direct); - if (avctx->idct_algo == FF_IDCT_AUTO) - avctx->idct_algo = FF_IDCT_SIMPLE; avctx->pix_fmt = AV_PIX_FMT_YUVJ420P; avctx->color_range = AVCOL_RANGE_JPEG;