Mercurial > mplayer.hg
comparison libmpcodecs/ve_lavc.c @ 33192:107d32318fa0
Remove obsolete options, fixes compilation with latest FFmpeg.
author | reimar |
---|---|
date | Fri, 22 Apr 2011 06:28:43 +0000 |
parents | 038ff73f9894 |
children | 30f5e5cd3676 |
comparison
equal
deleted
inserted
replaced
33191:32238139a2ff | 33192:107d32318fa0 |
---|---|
62 static int lavc_param_v4mv = 0; | 62 static int lavc_param_v4mv = 0; |
63 static int lavc_param_vme = 4; | 63 static int lavc_param_vme = 4; |
64 static float lavc_param_vqscale = -1; | 64 static float lavc_param_vqscale = -1; |
65 static int lavc_param_vqmin = 2; | 65 static int lavc_param_vqmin = 2; |
66 static int lavc_param_vqmax = 31; | 66 static int lavc_param_vqmax = 31; |
67 static int lavc_param_mb_qmin = 2; | |
68 static int lavc_param_mb_qmax = 31; | |
69 static float lavc_param_lmin = 2; | 67 static float lavc_param_lmin = 2; |
70 static float lavc_param_lmax = 31; | 68 static float lavc_param_lmax = 31; |
71 static float lavc_param_mb_lmin = 2; | 69 static float lavc_param_mb_lmin = 2; |
72 static float lavc_param_mb_lmax = 31; | 70 static float lavc_param_mb_lmax = 31; |
73 static int lavc_param_vqdiff = 3; | 71 static int lavc_param_vqdiff = 3; |
197 {"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 195 {"v4mv", &lavc_param_v4mv, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
198 {"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, | 196 {"vme", &lavc_param_vme, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL}, |
199 {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL}, | 197 {"vqscale", &lavc_param_vqscale, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 255.0, NULL}, |
200 {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, | 198 {"vqmin", &lavc_param_vqmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, |
201 {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, | 199 {"vqmax", &lavc_param_vqmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, |
202 {"mbqmin", &lavc_param_mb_qmin, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, | |
203 {"mbqmax", &lavc_param_mb_qmax, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, | |
204 {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, | 200 {"lmin", &lavc_param_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, |
205 {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, | 201 {"lmax", &lavc_param_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, |
206 {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, | 202 {"mblmin", &lavc_param_mb_lmin, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, |
207 {"mblmax", &lavc_param_mb_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, | 203 {"mblmax", &lavc_param_mb_lmax, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 255.0, NULL}, |
208 {"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, | 204 {"vqdiff", &lavc_param_vqdiff, CONF_TYPE_INT, CONF_RANGE, 1, 31, NULL}, |
375 | 371 |
376 lavc_venc_context->bit_rate_tolerance= lavc_param_vrate_tolerance*1000; | 372 lavc_venc_context->bit_rate_tolerance= lavc_param_vrate_tolerance*1000; |
377 lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate}; | 373 lavc_venc_context->time_base= (AVRational){mux_v->h.dwScale, mux_v->h.dwRate}; |
378 lavc_venc_context->qmin= lavc_param_vqmin; | 374 lavc_venc_context->qmin= lavc_param_vqmin; |
379 lavc_venc_context->qmax= lavc_param_vqmax; | 375 lavc_venc_context->qmax= lavc_param_vqmax; |
380 lavc_venc_context->mb_qmin= lavc_param_mb_qmin; | |
381 lavc_venc_context->mb_qmax= lavc_param_mb_qmax; | |
382 lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); | 376 lavc_venc_context->lmin= (int)(FF_QP2LAMBDA * lavc_param_lmin + 0.5); |
383 lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); | 377 lavc_venc_context->lmax= (int)(FF_QP2LAMBDA * lavc_param_lmax + 0.5); |
384 lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5); | 378 lavc_venc_context->mb_lmin= (int)(FF_QP2LAMBDA * lavc_param_mb_lmin + 0.5); |
385 lavc_venc_context->mb_lmax= (int)(FF_QP2LAMBDA * lavc_param_mb_lmax + 0.5); | 379 lavc_venc_context->mb_lmax= (int)(FF_QP2LAMBDA * lavc_param_mb_lmax + 0.5); |
386 lavc_venc_context->max_qdiff= lavc_param_vqdiff; | 380 lavc_venc_context->max_qdiff= lavc_param_vqdiff; |