mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-20 16:25:04 +02:00
Remove the "qcomp" OptionDef option from ffmpeg.c. The equally named "qcomp"
AVOption takes over its function and this occurs transparantly. Originally committed as revision 6267 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
99aaf41312
commit
3d720bda76
8
ffmpeg.c
8
ffmpeg.c
@ -115,7 +115,6 @@ static int video_mb_lmin = 2*FF_QP2LAMBDA;
|
||||
static int video_mb_lmax = 31*FF_QP2LAMBDA;
|
||||
static int video_qdiff = 3;
|
||||
static float video_qsquish = 0.0;
|
||||
static float video_qcomp = 0.5;
|
||||
static uint16_t *intra_matrix = NULL;
|
||||
static uint16_t *inter_matrix = NULL;
|
||||
#if 0 //experimental, (can be removed)
|
||||
@ -2449,11 +2448,6 @@ static void opt_qdiff(const char *arg)
|
||||
}
|
||||
}
|
||||
|
||||
static void opt_qcomp(const char *arg)
|
||||
{
|
||||
video_qcomp = atof(arg);
|
||||
}
|
||||
|
||||
static void opt_rc_initial_cplx(const char *arg)
|
||||
{
|
||||
video_rc_initial_cplx = atof(arg);
|
||||
@ -3033,7 +3027,6 @@ static void new_video_stream(AVFormatContext *oc)
|
||||
video_enc->mb_lmin = video_mb_lmin;
|
||||
video_enc->mb_lmax = video_mb_lmax;
|
||||
video_enc->max_qdiff = video_qdiff;
|
||||
video_enc->qcompress = video_qcomp;
|
||||
video_enc->rc_eq = video_rc_eq;
|
||||
video_enc->workaround_bugs = workaround_bugs;
|
||||
video_enc->thread_count = thread_count;
|
||||
@ -3981,7 +3974,6 @@ const OptionDef options[] = {
|
||||
{ "mblmax", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_mb_lmax}, "max macroblock quantiser scale (VBR)", "q" },
|
||||
{ "qdiff", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qdiff}, "max difference between the quantiser scale (VBR)", "q" },
|
||||
{ "qsquish", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qsquish}, "how to keep quantiser between qmin and qmax (0 = clip, 1 = use differentiable function)", "squish" },
|
||||
{ "qcomp", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qcomp}, "video quantiser scale compression (VBR)", "compression" },
|
||||
{ "rc_init_cplx", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_rc_initial_cplx}, "initial complexity for 1-pass encoding", "complexity" },
|
||||
{ "b_qfactor", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_b_qfactor}, "qp factor between p and b frames", "factor" },
|
||||
{ "i_qfactor", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_i_qfactor}, "qp factor between p and i frames", "factor" },
|
||||
|
Loading…
Reference in New Issue
Block a user