summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-08-11 20:36:05 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-08-11 20:36:05 +0800
commit9ef7a458ae6dabe2c4d122c1ebb1cd07ccca0402 (patch)
treee464cf840a99303308a3193b1c1a75cb68c67cd9
parentfdd542dce64d03c76d756b66609cf66c9e2458f2 (diff)
downloadmarcuscom-ports-9ef7a458ae6dabe2c4d122c1ebb1cd07ccca0402.tar
marcuscom-ports-9ef7a458ae6dabe2c4d122c1ebb1cd07ccca0402.tar.gz
marcuscom-ports-9ef7a458ae6dabe2c4d122c1ebb1cd07ccca0402.tar.bz2
marcuscom-ports-9ef7a458ae6dabe2c4d122c1ebb1cd07ccca0402.tar.lz
marcuscom-ports-9ef7a458ae6dabe2c4d122c1ebb1cd07ccca0402.tar.xz
marcuscom-ports-9ef7a458ae6dabe2c4d122c1ebb1cd07ccca0402.tar.zst
marcuscom-ports-9ef7a458ae6dabe2c4d122c1ebb1cd07ccca0402.zip
Sync with ports
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7033 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--multimedia/vlc-devel/files/patch-modules_codec_x264.c11
-rw-r--r--multimedia/vlc/files/patch-modules_codec_x264.c11
2 files changed, 22 insertions, 0 deletions
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_x264.c b/multimedia/vlc-devel/files/patch-modules_codec_x264.c
new file mode 100644
index 000000000..2ff0294a2
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules_codec_x264.c
@@ -0,0 +1,11 @@
+--- modules/codec/x264.c.orig Wed Aug 9 21:24:08 2006
++++ modules/codec/x264.c Wed Aug 9 21:24:27 2006
+@@ -588,7 +588,7 @@
+
+ /* cbr = 1 overrides qp or crf and sets an average bitrate
+ but maxrate = average bitrate is needed for "real" CBR */
+- if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1;
++ if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = 1;
+
+ var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
+ if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;
diff --git a/multimedia/vlc/files/patch-modules_codec_x264.c b/multimedia/vlc/files/patch-modules_codec_x264.c
new file mode 100644
index 000000000..2ff0294a2
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_codec_x264.c
@@ -0,0 +1,11 @@
+--- modules/codec/x264.c.orig Wed Aug 9 21:24:08 2006
++++ modules/codec/x264.c Wed Aug 9 21:24:27 2006
+@@ -588,7 +588,7 @@
+
+ /* cbr = 1 overrides qp or crf and sets an average bitrate
+ but maxrate = average bitrate is needed for "real" CBR */
+- if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1;
++ if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = 1;
+
+ var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
+ if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;