Mercurial > mplayer.hg

comparison libmpdemux/muxer_mpeg.c @ 14772:70f0de24b30a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed init_adelay to vdelay with opposite range
author nicodvb
date Tue, 22 Feb 2005 21:49:08 +0000
parents 70c446099f40
children 5c82935cb6f0
comparison
equal deleted inserted replaced
14771:26557a239706 14772:70f0de24b30a
165 {"vpswidth", &(conf_panscan_width), CONF_TYPE_INT, CONF_RANGE, 1, 16383, NULL}, 165 {"vpswidth", &(conf_panscan_width), CONF_TYPE_INT, CONF_RANGE, 1, 16383, NULL},
166 {"vpsheight", &(conf_panscan_height), CONF_TYPE_INT, CONF_RANGE, 1, 16383, NULL}, 166 {"vpsheight", &(conf_panscan_height), CONF_TYPE_INT, CONF_RANGE, 1, 16383, NULL},
167 {"vbitrate", &(conf_vbitrate), CONF_TYPE_INT, CONF_RANGE, 1, 104857599, NULL}, 167 {"vbitrate", &(conf_vbitrate), CONF_TYPE_INT, CONF_RANGE, 1, 104857599, NULL},
168 {"init_vpts", &(conf_init_vpts), CONF_TYPE_INT, CONF_RANGE, 100, 700, NULL}, //2*frametime at 60fps 168 {"init_vpts", &(conf_init_vpts), CONF_TYPE_INT, CONF_RANGE, 100, 700, NULL}, //2*frametime at 60fps
169 {"init_apts", &(conf_init_apts), CONF_TYPE_INT, CONF_RANGE, 100, 700, NULL}, 169 {"init_apts", &(conf_init_apts), CONF_TYPE_INT, CONF_RANGE, 100, 700, NULL},
170 {"init_adelay", &conf_init_adelay, CONF_TYPE_INT, CONF_RANGE, -32760, -1, NULL}, 170 {"vdelay", &conf_init_adelay, CONF_TYPE_INT, CONF_RANGE, 1, 32760, NULL},
171 {"drop", &conf_drop, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 171 {"drop", &conf_drop, CONF_TYPE_FLAG, 0, 0, 1, NULL},
172 {"tsaf", &conf_ts_allframes, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 172 {"tsaf", &conf_ts_allframes, CONF_TYPE_FLAG, 0, 0, 1, NULL},
173 {"skip_padding", &conf_skip_padding, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 173 {"skip_padding", &conf_skip_padding, CONF_TYPE_FLAG, 0, 0, 1, NULL},
174 {"noreorder", &conf_noreorder, CONF_TYPE_FLAG, 0, 0, 1, NULL}, 174 {"noreorder", &conf_noreorder, CONF_TYPE_FLAG, 0, 0, 1, NULL},
175 {NULL, NULL, 0, 0, 0, 0, NULL} 175 {NULL, NULL, 0, 0, 0, 0, NULL}
2416 2416
2417 muxer->sysrate = priv->muxrate; // initial muxrate = constrained stream parameter 2417 muxer->sysrate = priv->muxrate; // initial muxrate = constrained stream parameter
2418 priv->scr = muxer->file_end = 0; 2418 priv->scr = muxer->file_end = 0;
2419 2419
2420 if(conf_init_adelay) 2420 if(conf_init_adelay)
2421 priv->init_adelay = (double) conf_init_adelay / (double) 1000.0; 2421 priv->init_adelay = - (double) conf_init_adelay / (double) 1000.0;
2422 2422
2423 priv->drop = conf_drop; 2423 priv->drop = conf_drop;
2424 2424
2425 priv->buff = (uint8_t *) malloc(priv->packet_size); 2425 priv->buff = (uint8_t *) malloc(priv->packet_size);
2426 priv->tmp = (uint8_t *) malloc(priv->packet_size); 2426 priv->tmp = (uint8_t *) malloc(priv->packet_size);