Commit 5b2cfac6 authored by Jean-Paul Saman's avatar Jean-Paul Saman

debian/patches: Release X264_BUILD requirement (>= 83)

The vlc master git-tree requires X264_BUILD >= 86, which no current
'stable' linux distribution has available. Relax this requirement so
that vlc master git-tree can be build against a 'stable' distribution.
parent 59922548
From acc1348493a7687d70daf26be9889ecaf9c1a863 Mon Sep 17 00:00:00 2001
From: Jean-Paul Saman <jean-paul.saman@m2x.nl>
Date: Fri, 30 Jul 2010 11:14:36 +0200
Subject: [PATCH] modules/codec/x264.c: relax requirement to X264_BUILD >= 0.86
X264 requires X264_BUILD version >= 83 now and fix a few place
where X264_BUILD >= 86 are required.
---
configure.ac | 4 ++--
modules/codec/x264.c | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9f40507..4f67a5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2992,7 +2992,7 @@ if test "${enable_x264}" != "no"; then
AC_MSG_ERROR([the specified tree doesn't have x264.h])
fi
else
- PKG_CHECK_MODULES(X264,x264 >= 0.86, [
+ PKG_CHECK_MODULES(X264,x264 >= 0.27, [
VLC_ADD_PLUGIN([x264])
VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
@@ -3012,7 +3012,7 @@ if test "${enable_x264}" != "no"; then
fi
],[
if test "${enable_x264}" = "yes"; then
- AC_MSG_ERROR([Could not find libx264 >= 0.86 on your system: you may get it from http://www.videolan.org/x264.html])
+ AC_MSG_ERROR([Could not find libx264 >= 0.27 on your system: you may get it from http://www.videolan.org/x264.html])
fi
])
LDFLAGS="${LDFLAGS_save}"
diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index c88635a..c2f91f6 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -478,9 +478,11 @@ vlc_module_begin ()
add_string( SOUT_CFG_PREFIX "level", "0", NULL, LEVEL_TEXT,
LEVEL_LONGTEXT, false )
+#if X264_BUILD >= 86
add_string( SOUT_CFG_PREFIX "profile", "high", NULL, PROFILE_TEXT,
PROFILE_LONGTEXT, false )
change_string_list( x264_profile_names, x264_profile_names, 0 );
+#endif
add_bool( SOUT_CFG_PREFIX "interlaced", false, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT,
false )
@@ -676,10 +678,12 @@ vlc_module_begin ()
add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT,
STATS_LONGTEXT, false )
+#if X264_BUILD >= 86
add_string( SOUT_CFG_PREFIX "preset", NULL , NULL, PRESET_TEXT , PRESET_TEXT, false )
change_string_list( x264_preset_names, x264_preset_names, 0 );
add_string( SOUT_CFG_PREFIX "tune", NULL , NULL, TUNE_TEXT, TUNE_TEXT, false )
change_string_list( x264_tune_names, x264_tune_names, 0 );
+#endif
vlc_module_end ()
@@ -756,6 +760,7 @@ static int Open ( vlc_object_t *p_this )
p_sys->psz_stat_name = NULL;
x264_param_default( &p_sys->param );
+#if X264_BUILD >= 86
char *psz_preset = var_GetString( p_enc, SOUT_CFG_PREFIX "preset" );
char *psz_tune = var_GetString( p_enc, SOUT_CFG_PREFIX "tune" );
if( *psz_preset == '\0' )
@@ -766,6 +771,8 @@ static int Open ( vlc_object_t *p_this )
x264_param_default_preset( &p_sys->param, psz_preset, psz_tune );
free( psz_preset );
free( psz_tune );
+#endif
+
p_sys->param.i_width = p_enc->fmt_in.video.i_width;
p_sys->param.i_height = p_enc->fmt_in.video.i_height;
@@ -1154,6 +1161,7 @@ static int Open ( vlc_object_t *p_this )
p_sys->param.rc.i_vbv_buffer_size /= p_sys->param.i_fps_num;
}
+#if X264_BUILD >= 86
/* Check if user has given some profile (baseline,main,high) to limit
* settings, and apply those*/
psz_val = var_GetString( p_enc, SOUT_CFG_PREFIX "profile" );
@@ -1176,7 +1184,7 @@ static int Open ( vlc_object_t *p_this )
/* high profile don't restrict stuff*/
}
free( psz_val );
-
+#endif
unsigned i_cpu = vlc_CPU();
if( !(i_cpu & CPU_CAPABILITY_MMX) )
--
1.7.2.2
052_as-needed.diff
#052_as-needed.diff
101_certificates_paths.diff
102_dejavu_font.diff
104_notify.diff
#104_notify.diff
200_osdmenu_paths.diff
300_manpage_syntax.diff
#401_i420_mmx_pic.diff
501_decrease_alsa_buffer.diff
502_fix_typo.patch
#502_fix_typo.patch
#519-Typedef-changes-from-xulrunner-1.9.1.patch
#520-Don-t-hardcode-OJI-define-deprecated-xith-libxul-1.9.patch
#521-Untracked-API-change-utf8-to-UTF8.patch
......@@ -16,4 +16,5 @@
#525-Mozilla-more-fixes.patch
#600-drop-OJI-xul-192.patch
#CVE-2010-2937.patch
901-modules-codec-x264.c-relax-requirement-to-X264_BUILD.patch
0001-mux-mpeg-ts.c-Generate-splice-points.patch
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment