| 1 |
aballier 08/10/06 08:22:46 |
| 2 |
|
| 3 |
Added: libquicktime-1.0.3-x264-65.patch |
| 4 |
Log: |
| 5 |
Another patch merged upstream to fix compatibility with latest x264. |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/libquicktime/files/libquicktime-1.0.3-x264-65.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libquicktime/files/libquicktime-1.0.3-x264-65.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libquicktime/files/libquicktime-1.0.3-x264-65.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libquicktime-1.0.3-x264-65.patch |
| 15 |
=================================================================== |
| 16 |
Index: plugins/x264/lqt_x264.c |
| 17 |
=================================================================== |
| 18 |
RCS file: /cvsroot/libquicktime/libquicktime/plugins/x264/lqt_x264.c,v |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -B -r1.11 lqt_x264.c |
| 21 |
--- plugins/x264/lqt_x264.c 22 Sep 2008 18:24:49 -0000 1.11 |
| 22 |
+++ plugins/x264/lqt_x264.c 5 Oct 2008 18:32:41 -0000 |
| 23 |
@@ -323,11 +323,20 @@ |
| 24 |
.real_name = TRS("Partition decision"), |
| 25 |
.type = LQT_PARAMETER_INT, |
| 26 |
.val_min = { .val_int = 1 }, |
| 27 |
+#if X264_BUILD < 65 |
| 28 |
.val_max = { .val_int = 7 }, |
| 29 |
+#else |
| 30 |
+ .val_max = { .val_int = 9 }, |
| 31 |
+#endif |
| 32 |
.val_default = { .val_int = 5 }, |
| 33 |
.help_string = TRS("Subpixel motion estimation and partition decision " |
| 34 |
+#if X264_BUILD < 65 |
| 35 |
"quality: 1=fast, 7=best.") |
| 36 |
+#else |
| 37 |
+ "quality: 1=fast, 9=best.") |
| 38 |
+#endif |
| 39 |
}, |
| 40 |
+#if X264_BUILD < 65 |
| 41 |
{ |
| 42 |
.name = "x264_b_bframe_rdo", |
| 43 |
.real_name = TRS("RD based mode decision for B-frames"), |
| 44 |
@@ -338,6 +347,7 @@ |
| 45 |
.help_string = TRS("RD based mode decision for B-frames. Requires partition " |
| 46 |
"decision 6.") |
| 47 |
}, |
| 48 |
+#endif |
| 49 |
{ |
| 50 |
.name = "x264_i_me_range", |
| 51 |
.real_name = TRS("Search range"), |
| 52 |
@@ -377,6 +387,7 @@ |
| 53 |
.help_string = TRS("Allow each MB partition in P-frames to have it's own " |
| 54 |
"reference number") |
| 55 |
}, |
| 56 |
+#if X264_BUILD < 65 |
| 57 |
{ |
| 58 |
.name = "x264_b_bidir_me", |
| 59 |
.real_name = TRS("Bidirectional ME"), |
| 60 |
@@ -386,6 +397,7 @@ |
| 61 |
.val_default = { .val_int = 0 }, |
| 62 |
.help_string = TRS("Jointly optimize both MVs in B-frames") |
| 63 |
}, |
| 64 |
+#endif |
| 65 |
{ |
| 66 |
.name = "x264_b_weighted_bipred", |
| 67 |
.real_name = TRS("Weighted biprediction"), |
| 68 |
Index: plugins/x264/x264.c |
| 69 |
=================================================================== |
| 70 |
RCS file: /cvsroot/libquicktime/libquicktime/plugins/x264/x264.c,v |
| 71 |
retrieving revision 1.25 |
| 72 |
diff -u -B -r1.25 x264.c |
| 73 |
--- plugins/x264/x264.c 22 Sep 2008 22:01:40 -0000 1.25 |
| 74 |
+++ plugins/x264/x264.c 5 Oct 2008 18:32:42 -0000 |
| 75 |
@@ -880,12 +880,16 @@ |
| 76 |
ENUMPARAM("x264_i_me_method", codec->params.analyse.i_me_method, me_methods); |
| 77 |
|
| 78 |
INTPARAM("x264_i_subpel_refine", codec->params.analyse.i_subpel_refine); |
| 79 |
+#if X264_BUILD < 65 |
| 80 |
INTPARAM("x264_b_bframe_rdo", codec->params.analyse.b_bframe_rdo); |
| 81 |
+#endif |
| 82 |
INTPARAM("x264_i_me_range", codec->params.analyse.i_me_range); |
| 83 |
INTPARAM("x264_i_frame_reference", codec->params.i_frame_reference); |
| 84 |
INTPARAM("x264_b_chroma_me", codec->params.analyse.b_chroma_me); |
| 85 |
INTPARAM("x264_b_mixed_references", codec->params.analyse.b_mixed_references); |
| 86 |
+#if X264_BUILD < 65 |
| 87 |
INTPARAM("x264_b_bidir_me", codec->params.analyse.b_bidir_me); |
| 88 |
+#endif |
| 89 |
INTPARAM("x264_b_weighted_bipred", codec->params.analyse.b_weighted_bipred); |
| 90 |
|
| 91 |
ENUMPARAM("x264_i_direct_mv_pred", codec->params.analyse.i_direct_mv_pred, direct_modes); |
Archives