| 1 |
aballier 08/10/08 06:31:19 |
| 2 |
|
| 3 |
Added: 0001-Fix-build-with-x264-build-65.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/vlc/files/0001-Fix-build-with-x264-build-65.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/files/0001-Fix-build-with-x264-build-65.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/files/0001-Fix-build-with-x264-build-65.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 0001-Fix-build-with-x264-build-65.patch |
| 15 |
=================================================================== |
| 16 |
From 34e7b423aa2800666e7b721617d7d73dd78e3c50 Mon Sep 17 00:00:00 2001 |
| 17 |
From: Alexis Ballier <aballier@g.o> |
| 18 |
Date: Sun, 5 Oct 2008 20:53:05 +0200 |
| 19 |
Subject: [PATCH] Fix build with x264 build 65 |
| 20 |
|
| 21 |
See http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=c89bc900a3bf0d4c4c728ad378703970b4f14e18 for more details. |
| 22 |
--- |
| 23 |
modules/codec/x264.c | 15 ++++++++++----- |
| 24 |
1 files changed, 10 insertions(+), 5 deletions(-) |
| 25 |
|
| 26 |
diff --git a/modules/codec/x264.c b/modules/codec/x264.c |
| 27 |
index dc84bb0..d48bb0d 100644 |
| 28 |
--- a/modules/codec/x264.c |
| 29 |
+++ b/modules/codec/x264.c |
| 30 |
@@ -269,7 +269,12 @@ static void Close( vlc_object_t * ); |
| 31 |
|
| 32 |
#define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \ |
| 33 |
"quality") |
| 34 |
-#if X264_BUILD >= 46 /* r477 */ |
| 35 |
+#if X264_BUILD >= 65 |
| 36 |
+#define SUBME_MAX 9 |
| 37 |
+#define SUBME_LONGTEXT N_( "This parameter controls quality versus speed " \ |
| 38 |
+ "tradeoffs involved in the motion estimation decision process " \ |
| 39 |
+ "(lower = quicker and higher = better quality). Range 1 to 9." ) |
| 40 |
+#elif X264_BUILD >= 46 /* r477 */ |
| 41 |
#define SUBME_MAX 7 |
| 42 |
#define SUBME_LONGTEXT N_( "This parameter controls quality versus speed " \ |
| 43 |
"tradeoffs involved in the motion estimation decision process " \ |
| 44 |
@@ -589,7 +594,7 @@ vlc_module_begin(); |
| 45 |
change_integer_range( 1, SUBME_MAX ); |
| 46 |
add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ); /* Deprecated since 0.8.5 */ |
| 47 |
|
| 48 |
-#if X264_BUILD >= 41 /* r368 */ |
| 49 |
+#if X264_BUILD >= 41 && X264_BUILD < 65 /* r368 */ |
| 50 |
add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT, |
| 51 |
B_RDO_LONGTEXT, false ); |
| 52 |
#endif |
| 53 |
@@ -604,7 +609,7 @@ vlc_module_begin(); |
| 54 |
CHROMA_ME_LONGTEXT, false ); |
| 55 |
#endif |
| 56 |
|
| 57 |
-#if X264_BUILD >= 43 /* r390 */ |
| 58 |
+#if X264_BUILD >= 43 && X264_BUILD < 65 /* r390 */ |
| 59 |
add_bool( SOUT_CFG_PREFIX "bime", 0, NULL, BIME_TEXT, |
| 60 |
BIME_LONGTEXT, false ); |
| 61 |
#endif |
| 62 |
@@ -1082,7 +1087,7 @@ static int Open ( vlc_object_t *p_this ) |
| 63 |
p_sys->param.analyse.i_trellis = val.i_int; |
| 64 |
#endif |
| 65 |
|
| 66 |
-#if X264_BUILD >= 41 |
| 67 |
+#if X264_BUILD >= 41 && X264_BUILD < 65 |
| 68 |
var_Get( p_enc, SOUT_CFG_PREFIX "b-rdo", &val ); |
| 69 |
p_sys->param.analyse.b_bframe_rdo = val.b_bool; |
| 70 |
#endif |
| 71 |
@@ -1092,7 +1097,7 @@ static int Open ( vlc_object_t *p_this ) |
| 72 |
p_sys->param.analyse.b_fast_pskip = val.b_bool; |
| 73 |
#endif |
| 74 |
|
| 75 |
-#if X264_BUILD >= 43 |
| 76 |
+#if X264_BUILD >= 43 && X264_BUILD < 65 |
| 77 |
var_Get( p_enc, SOUT_CFG_PREFIX "bime", &val ); |
| 78 |
p_sys->param.analyse.b_bidir_me = val.b_bool; |
| 79 |
#endif |
| 80 |
-- |
| 81 |
1.6.0.2 |
Archives