From patchwork Mon Nov 13 04:38:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6023 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1679623jah; Sun, 12 Nov 2017 20:38:39 -0800 (PST) X-Google-Smtp-Source: AGs4zMa+QNSpEOH4UVgcgt33358zuEFNADhhcrNSPhq4TfiG2rWvVd9c/70eYx7KUSqk7M1S+x7q X-Received: by 10.28.168.88 with SMTP id r85mr2796066wme.63.1510547918963; Sun, 12 Nov 2017 20:38:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510547918; cv=none; d=google.com; s=arc-20160816; b=YJl8paeS611V3BGooz+7ij6+88zvKW0HOVK39YuImNgam+PisIIMJ4jA6SwJnZI+5L +cIsNYEjvHKtoIQB5P4kuP0TVIpjq6S+9gzfFVcCq+MiywRXSkRW4zYNXbAiwhskqCHI Ezeev5U+KcvPnhEI172X4Zzahy+v+v1hkQe8N0RFCsagloPPmYFhlDcVZt9ZrNu7T4Kk wKi9WTKcH3wV/IaPinlin4j7eBKYzalVlPw/j1jEGj89DKMR4t5x8ejPJGkLO5QtRlvC k8KQgIUmCbkAZaWl6CPqOoJj/r4SGacgE/SlKi4A1ioKk2+iSG6cFiiNbhFYjvy+p9L0 wGrg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=724gVQTHs5H5sgOT/iIQ3jQJXAJnbA1pL7pNByfpHjo=; b=UtWSRczQ4lW8G+IRTdzqbeVXQ+SpDU4JE8sRURvHy9fkaMLUV+onsYBB8sPPaHpmQW 9r9o3OpdgVQohQDWIpBxQL5lil9mxmZJuEpap0U9Rn/xOdyiTFSrbU6powSXfkrPUSDo UFy0ls6nGWvQaem1tt9PbOAm8KQo7o2zzqN8zgHoi34AIoNRIVLYF5902Q74kP3SH01Y baX7kffl777CyN7qnwHcnKeThZtV9Qo9U9UgoUar8CcBA0BJQWiEtRvJkSWBpoKD7r5D maoUDc0NtmWo0tw2B5qvtZGR1V0GusnepKzoBQdhUD4X3FwND0Hk5PKkIyymLWrMw1dN jeUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=R2hCA5b+; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y204si5539358wme.142.2017.11.12.20.38.37; Sun, 12 Nov 2017 20:38:38 -0800 (PST) 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 header.s=20161025 header.b=R2hCA5b+; 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 89EC168A509; Mon, 13 Nov 2017 06:38:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F6E368A4AF for ; Mon, 13 Nov 2017 06:38:16 +0200 (EET) Received: by mail-qt0-f194.google.com with SMTP id f8so18119738qta.5 for ; Sun, 12 Nov 2017 20:38:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=YiqcOhIu0ylHSgWIkqD6Ms+7o4JbUrnYA+HTYbylDTQ=; b=R2hCA5b+6+gbrjE+IxdwC1k1ZBE1InpDJLUOHHkWbLeCNsQIJZGVmKg/dCAbZg2U31 CP10Nwfx+wzIdn85LWTmNT0V5ZOvUkW3EY6mHyKxYgCZA0C8uKLBQPeuXtU1O5U1RrlT vrpLc9cvCnNW9TDH3vzw18UXCyZgiwFwa6AQo951bW3XPd4EwO+K6O/9gPkohAqH03SC 6cYIMeRnbKcJZeHePccb1kxXrWbRt5x13qqrLl6l09t0xmxlRsAijSwEqIFujqzLy5EU GUUgAJG9kmQN25XqTyi2yRaibtq23nXDa5RfluGc3N/YAS2ESMWq56/sLB+Qfve4xO+C pKgw== 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=YiqcOhIu0ylHSgWIkqD6Ms+7o4JbUrnYA+HTYbylDTQ=; b=euHU3AxUl6GQk/ECu3DsmW8SM81eUWE2rHePYG31VITfWKinNf4oQOjvGNJGS64+MH xBGKi8AOZC0FQF4zHOL2MEvWERktbjynO+5g9w6owq5QUqN71/6QvPC8jhqOx6hmU9kQ NhC8QOqbUZGITonzgAjK4bPIezuKZPv2QPBo62tbWHW+0evCTQjdMteGaveyno1GD0wJ ucsHDJpMSIQPpukihNdEX6uro39Ql1Rdz+RdLGhEQbq54KdLOtCBGavIw8TSoACVPj2a j4YcsKFNaXtq2qZR0Ky7SPIicBVDSUx0QtGNP/Z8pg8RvpEjK41R+v+X0gm3V+kcfy/6 zfeg== X-Gm-Message-State: AJaThX7nYZIkacAHiSd50ty4vruUgBCWazuP9Bk70jF1j74T0Xnq7HFO 4NZ0s6YHHCnnrYMWJYGA9Xn4YQ== X-Received: by 10.200.50.144 with SMTP id z16mr12829880qta.306.1510547909243; Sun, 12 Nov 2017 20:38:29 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id g7sm7435206qkd.64.2017.11.12.20.38.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Nov 2017 20:38:28 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Nov 2017 01:38:09 -0300 Message-Id: <20171113043809.9192-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] configure: add missing optional dependecy on libxvid to mpegvideoenc 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" It uses some of its rate control functionality when available. This also reverts commit 91df92e442844fbde69396d169bb352091cbb66f, implementing a proper fix instead. Signed-off-by: James Almer --- configure | 1 + libavcodec/Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 46b4815f2e..bf50bfcfc3 100755 --- a/configure +++ b/configure @@ -2416,6 +2416,7 @@ mpegaudio_select="mpegaudiodsp mpegaudioheader" mpegaudiodsp_select="dct" mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp" mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" +mpegvideoenc_suggest="libxvid" vc1dsp_select="h264chroma qpeldsp startcode" rdft_select="fft" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8c5dfd6319..7ac4e13a06 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -96,6 +96,7 @@ OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o msmpeg4data.o OBJS-$(CONFIG_IVIDSP) += ivi_dsp.o OBJS-$(CONFIG_JNI) += ffjni.o jni.o OBJS-$(CONFIG_JPEGTABLES) += jpegtables.o +OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o OBJS-$(CONFIG_LLAUDDSP) += lossless_audiodsp.o OBJS-$(CONFIG_LLVIDDSP) += lossless_videodsp.o OBJS-$(CONFIG_LLVIDENCDSP) += lossless_videoencdsp.o @@ -958,7 +959,7 @@ OBJS-$(CONFIG_LIBX262_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o -OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o libxvid_rc.o +OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o # parsers