OSDN Git Service

Set an minimum subtitle display time of three seconds *or* until the next subtitle...
[handbrake-jp/handbrake-jp-git.git] / contrib / patch-libquicktime.patch
1 diff -Naur libquicktime/configure libquicktime_patched/configure
2 --- libquicktime/configure      2006-08-03 01:02:25.000000000 +0200
3 +++ libquicktime_patched/configure      2007-02-21 16:16:22.000000000 +0100
4 @@ -25564,7 +25564,7 @@
5  
6  
7  
8 -have_libavcodec=false
9 +have_libavcodec="true"
10  
11  AVCODEC_BUILD="3277056"
12  
13 @@ -25656,6 +25656,8 @@
14  fi
15  rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
16  fi
17 +have_libavcodec="true"
18 +avcodec_ok="true"
19  CFLAGS="$CFLAGS_save"
20  LIBS="$LIBS_save"
21  
22 @@ -26048,7 +26050,7 @@
23  
24  
25  
26 -have_faac="false"
27 +have_faac="true"
28  FAAC_REQUIRED="1.24"
29  
30  
31 @@ -26134,6 +26136,7 @@
32  
33  
34  
35 +have_faac="true"
36  
37  if test x$have_faac = xtrue; then
38    HAVE_FAAC_TRUE=
39 @@ -26261,7 +26264,7 @@
40  
41  
42  
43 -have_x264="false"
44 +have_x264="true"
45  
46  if test $have_gpl = "true"; then
47  X264_REQUIRED="0.48"
48 @@ -26321,6 +26324,7 @@
49  
50  fi
51  
52 +have_x264="true"
53  
54  if test x$have_x264 = xtrue; then
55    HAVE_X264_TRUE=
56 diff -Naur libquicktime/plugins/x264/x264.c libquicktime_patched/plugins/x264/x264.c
57 --- libquicktime/plugins/x264/x264.c    2006-07-25 13:35:15.000000000 +0200
58 +++ libquicktime_patched/plugins/x264/x264.c    2007-02-21 16:14:11.000000000 +0100
59 @@ -493,7 +493,7 @@
60        {
61        /* Force ABR */
62        codec->params.rc.i_rc_method = X264_RC_ABR;
63 -      codec->params.rc.i_rf_constant = 0;
64 +      // codec->params.rc.i_rf_constant = 0;
65        if(codec->pass == 1)
66          {
67          /* Strings will be made private by x264 */
68 @@ -655,7 +655,7 @@
69    INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate);
70    
71    INTPARAM("x264_i_qp_constant", codec->params.rc.i_qp_constant);
72 -  INTPARAM("x264_i_rf_constant", codec->params.rc.i_rf_constant);
73 +  // INTPARAM("x264_i_rf_constant", codec->params.rc.i_rf_constant);
74    INTPARAM("x264_i_qp_min", codec->params.rc.i_qp_min);
75    INTPARAM("x264_i_qp_max", codec->params.rc.i_qp_max);
76    INTPARAM("x264_i_qp_step", codec->params.rc.i_qp_step);