diff options
author | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2007-02-26 03:04:06 +0000 |
---|---|---|
committer | rafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4> | 2007-02-26 03:04:06 +0000 |
commit | d83f61bc6d21979418917d7392edfa4a0cda156d (patch) | |
tree | 7970ba6863f95ef5c0e80d4b82d9504626b01c74 | |
parent | 85a9ce679e38ed785aa0ee62cddf4e0ecb21f639 (diff) | |
download | slackbuilds-d83f61bc6d21979418917d7392edfa4a0cda156d.tar.gz slackbuilds-d83f61bc6d21979418917d7392edfa4a0cda156d.tar.bz2 |
libquicktime fix for newer libx264
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1030 370017ae-e619-0410-ac65-c121f96126d4
-rw-r--r-- | media/libs/libquicktime/libquicktime-0.9.10.diff | 30 | ||||
-rwxr-xr-x | media/libs/libquicktime/libquicktime.SlackBuild | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/media/libs/libquicktime/libquicktime-0.9.10.diff b/media/libs/libquicktime/libquicktime-0.9.10.diff new file mode 100644 index 00000000..0cde4303 --- /dev/null +++ b/media/libs/libquicktime/libquicktime-0.9.10.diff @@ -0,0 +1,30 @@ +diff -Naupr libquicktime-0.9.10.orig/plugins/x264/x264.c libquicktime-0.9.10/plugins/x264/x264.c +--- libquicktime-0.9.10.orig/plugins/x264/x264.c 2006-07-25 13:35:15.000000000 +0200 ++++ libquicktime-0.9.10/plugins/x264/x264.c 2006-10-24 13:40:41.000000000 +0200 +@@ -91,7 +91,7 @@ static void dump_params(x264_param_t * p + fprintf(stderr, " i_qp_step: %d\n", params->rc.i_qp_step); + fprintf(stderr, " b_cbr: %d\n", params->rc.b_cbr); + fprintf(stderr, " i_bitrate: %d\n", params->rc.i_bitrate); +- fprintf(stderr, " i_rf_constant: %d\n", params->rc.i_rf_constant); ++ fprintf(stderr, " f_rf_constant: %d\n", params->rc.f_rf_constant); + fprintf(stderr, " f_rate_tolerance: %f\n", params->rc.f_rate_tolerance); + fprintf(stderr, " i_vbv_max_bitrate: %d\n", params->rc.i_vbv_max_bitrate); + fprintf(stderr, " i_vbv_buffer_size: %d\n", params->rc.i_vbv_buffer_size); +@@ -493,7 +493,7 @@ static int encode(quicktime_t *file, uns + { + /* Force ABR */ + codec->params.rc.i_rc_method = X264_RC_ABR; +- codec->params.rc.i_rf_constant = 0; ++ codec->params.rc.f_rf_constant = 0; + if(codec->pass == 1) + { + /* Strings will be made private by x264 */ +@@ -655,7 +655,7 @@ static int set_parameter(quicktime_t *fi + INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate); + + INTPARAM("x264_i_qp_constant", codec->params.rc.i_qp_constant); +- INTPARAM("x264_i_rf_constant", codec->params.rc.i_rf_constant); ++ INTPARAM("x264_f_rf_constant", codec->params.rc.f_rf_constant); + INTPARAM("x264_i_qp_min", codec->params.rc.i_qp_min); + INTPARAM("x264_i_qp_max", codec->params.rc.i_qp_max); + INTPARAM("x264_i_qp_step", codec->params.rc.i_qp_step); diff --git a/media/libs/libquicktime/libquicktime.SlackBuild b/media/libs/libquicktime/libquicktime.SlackBuild index fb065249..f4c50a79 100755 --- a/media/libs/libquicktime/libquicktime.SlackBuild +++ b/media/libs/libquicktime/libquicktime.SlackBuild @@ -65,6 +65,7 @@ cd $TMP tar xvf$tarflag $SRC_DIR/$SRC cd $PACKAGE-$VERSION +# the current patch for 0.9.10 is required for newer libx264 if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then patch -p1 < $CWD/$PACKAGE-$VERSION.diff fi |