From 4fbb1a042eb5d8567bffc8f4dd2fbbaa724900ac Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Tue, 17 Apr 2012 15:44:24 -0400
Subject: x264enc: Port to GstVideoEncoder baseclass

Conflicts:

	configure.ac
	ext/x264/gstx264enc.c
	ext/x264/gstx264enc.h

Back to 0.10 state, needs to be ported to 0.11 again.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 706afa17..01d7d48c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,7 +357,7 @@ AG_GST_CHECK_FEATURE(TWOLAME, [twolame], twolame, [
 dnl *** x264 (MPEG-4 part 10/h.264/AVC encoder) ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_X264, true)
 AG_GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
-  AG_GST_PKG_CHECK_MODULES(X264, x264 >= 0.106.0)
+  AG_GST_PKG_CHECK_MODULES(X264, x264 >= 0.120.0)
 ])
 
 else
-- 
cgit v1.2.3