virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Make ffmpeg work with x264 r592

Browse Source 
Originally committed as revision 6711 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Barbato
2006-10-16 17:44:29 +00:00
parent 212d84881a
commit 9f1c1c9985
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/avcodec.h
View File

@@ -1889,7 +1889,7 @@ typedef struct AVCodecContext {
* - encoding: set by user. * - encoding: set by user.
* - decoding: unused * - decoding: unused
*/ */
int crf; float crf;
/** /**
* constant quantization parameter rate control method * constant quantization parameter rate control method

2
libavcodec/utils.c
View File

@@ -684,7 +684,7 @@ static const AVOption options[]={
{"mepc", "motion estimation bitrate penalty compensation (1.0 = 256)", OFFSET(me_penalty_compensation), FF_OPT_TYPE_INT, 256, INT_MIN, INT_MAX, V|E}, {"mepc", "motion estimation bitrate penalty compensation (1.0 = 256)", OFFSET(me_penalty_compensation), FF_OPT_TYPE_INT, 256, INT_MIN, INT_MAX, V|E},
{"bidir_refine", NULL, OFFSET(bidir_refine), FF_OPT_TYPE_INT, DEFAULT, 0, 4, V|E}, {"bidir_refine", NULL, OFFSET(bidir_refine), FF_OPT_TYPE_INT, DEFAULT, 0, 4, V|E},
{"brd_scale", NULL, OFFSET(brd_scale), FF_OPT_TYPE_INT, DEFAULT, 0, 10, V|E}, {"brd_scale", NULL, OFFSET(brd_scale), FF_OPT_TYPE_INT, DEFAULT, 0, 10, V|E},
{"crf", NULL, OFFSET(crf), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"crf", NULL, OFFSET(crf), FF_OPT_TYPE_FLOAT, DEFAULT, 0, 51, V|E},
{"cqp", NULL, OFFSET(cqp), FF_OPT_TYPE_INT, -1, INT_MIN, INT_MAX, V|E}, {"cqp", NULL, OFFSET(cqp), FF_OPT_TYPE_INT, -1, INT_MIN, INT_MAX, V|E},
{"keyint_min", NULL, OFFSET(keyint_min), FF_OPT_TYPE_INT, 25, INT_MIN, INT_MAX, V|E}, {"keyint_min", NULL, OFFSET(keyint_min), FF_OPT_TYPE_INT, 25, INT_MIN, INT_MAX, V|E},
{"refs", NULL, OFFSET(refs), FF_OPT_TYPE_INT, 1, INT_MIN, INT_MAX, V|E}, {"refs", NULL, OFFSET(refs), FF_OPT_TYPE_INT, 1, INT_MIN, INT_MAX, V|E},

2
libavcodec/x264.c
View File

@@ -146,7 +146,7 @@ X264_init(AVCodecContext *avctx)
else{ else{
if(avctx->crf){ if(avctx->crf){
x4->params.rc.i_rc_method = X264_RC_CRF; x4->params.rc.i_rc_method = X264_RC_CRF;
x4->params.rc.i_rf_constant = avctx->crf; x4->params.rc.f_rf_constant = avctx->crf;
}else if(avctx->cqp > -1){ }else if(avctx->cqp > -1){
x4->params.rc.i_rc_method = X264_RC_CQP; x4->params.rc.i_rc_method = X264_RC_CQP;
x4->params.rc.i_qp_constant = avctx->cqp; x4->params.rc.i_qp_constant = avctx->cqp;