diff options
author | Michael Johnson <ahze@FreeBSD.org> | 2007-04-30 16:02:29 +0000 |
---|---|---|
committer | Michael Johnson <ahze@FreeBSD.org> | 2007-04-30 16:02:29 +0000 |
commit | 5f2acea477ea8e2fc0596e9654cd9a93c335b823 (patch) | |
tree | b0ea8d9109e72c005553f3449a5d2b3ca73a3e4a /multimedia/vlc/files/patch-modules_codec_x264.c | |
parent | - Really update WWW: (diff) |
Update to 0.8.6b (merged from multimedia/vlc-devel, note this requires ffmpeg-devel now!)
Diffstat (limited to 'multimedia/vlc/files/patch-modules_codec_x264.c')
-rw-r--r-- | multimedia/vlc/files/patch-modules_codec_x264.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/multimedia/vlc/files/patch-modules_codec_x264.c b/multimedia/vlc/files/patch-modules_codec_x264.c deleted file mode 100644 index 93a3fc8debd0..000000000000 --- a/multimedia/vlc/files/patch-modules_codec_x264.c +++ /dev/null @@ -1,23 +0,0 @@ ---- modules/codec/x264.c.orig Sat May 6 15:52:19 2006 -+++ modules/codec/x264.c Fri Nov 3 16:47:49 2006 -@@ -547,7 +547,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; -@@ -737,7 +737,11 @@ - #if X264_BUILD >= 37 - var_Get( p_enc, SOUT_CFG_PREFIX "crf", &val ); - if( val.i_int >= 0 && val.i_int <= 51 ) /* crf != 0 overrides qp */ -+#if X264_BUILD >= 54 -+ p_sys->param.rc.f_rf_constant = val.i_int; -+#else - p_sys->param.rc.i_rf_constant = val.i_int; -+#endif - #endif - - #if X264_BUILD >= 39 |