diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2006-11-03 21:48:13 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2006-11-03 21:48:13 +0000 |
| commit | 028e210af33e11d12784cc9259a99c2420777201 (patch) | |
| tree | 0244cde6bdde3f4214443bfdb6b6a2b6c4774f97 /multimedia/vlc | |
| parent | - Fix PORTVERSION (diff) | |
- Fix build with latest x264
Reported by: pointyhat via kris
Notes
Notes:
svn path=/head/; revision=176300
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/files/patch-modules_codec_x264.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/multimedia/vlc/files/patch-modules_codec_x264.c b/multimedia/vlc/files/patch-modules_codec_x264.c index 2ff0294a2ab2..93a3fc8debd0 100644 --- a/multimedia/vlc/files/patch-modules_codec_x264.c +++ b/multimedia/vlc/files/patch-modules_codec_x264.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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 */ @@ -9,3 +9,15 @@ 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 |