diff options
author | ahze <ahze@FreeBSD.org> | 2006-08-10 18:29:51 +0800 |
---|---|---|
committer | ahze <ahze@FreeBSD.org> | 2006-08-10 18:29:51 +0800 |
commit | 795c57be88393b1f26f9d393be435c804290edce (patch) | |
tree | e995c6ba05764a71a438663b621e6072e29af526 /multimedia | |
parent | 81828100778295d6555ebe32ff3fc5f91b4cb524 (diff) | |
download | freebsd-ports-gnome-795c57be88393b1f26f9d393be435c804290edce.tar.gz freebsd-ports-gnome-795c57be88393b1f26f9d393be435c804290edce.tar.zst freebsd-ports-gnome-795c57be88393b1f26f9d393be435c804290edce.zip |
- Fix build with x264
Reported by: many
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c | 11 | ||||
-rw-r--r-- | multimedia/vlc-devel/files/patch-modules_codec_x264.c | 11 | ||||
-rw-r--r-- | multimedia/vlc/files/patch-modules_codec_x264.c | 11 |
3 files changed, 33 insertions, 0 deletions
diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c b/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c new file mode 100644 index 000000000000..fed127c13b4e --- /dev/null +++ b/multimedia/ffmpeg-devel/files/patch-libavcodec_x264.c @@ -0,0 +1,11 @@ +--- libavcodec/x264.c.orig Thu Aug 10 06:10:59 2006 ++++ libavcodec/x264.c Thu Aug 10 06:11:24 2006 +@@ -148,7 +148,7 @@ + + // if neither crf nor cqp modes are selected we have to enable the RC + // we do it this way because we cannot check if the bitrate has been set +- if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1; ++ if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = 1; + + x4->params.i_bframe = avctx->max_b_frames; + x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; 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 000000000000..2ff0294a2ab2 --- /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 000000000000..2ff0294a2ab2 --- /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; |