Mercurial > mplayer.hg
changeset 14772:70f0de24b30a
renamed init_adelay to vdelay with opposite range
| author | nicodvb |
|---|---|
| date | Tue, 22 Feb 2005 21:49:08 +0000 |
| parents | 26557a239706 |
| children | d0a2465795b3 |
| files | DOCS/man/en/mplayer.1 libmpdemux/muxer_mpeg.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Tue Feb 22 21:27:58 2005 +0000 +++ b/DOCS/man/en/mplayer.1 Tue Feb 22 21:49:08 2005 +0000 @@ -7635,8 +7635,8 @@ initial audio pts, in milliseconds (default: 200) . .TP -.B init_adelay=<-32760\--1> -Initial audio anticipation time == video delay, in milliseconds (default: 0), +.B vdelay=<1\-32760> +Initial video delay time, in milliseconds (default: 0), use it if you want to delay video with respect to audio. . .TP
--- a/libmpdemux/muxer_mpeg.c Tue Feb 22 21:27:58 2005 +0000 +++ b/libmpdemux/muxer_mpeg.c Tue Feb 22 21:49:08 2005 +0000 @@ -167,7 +167,7 @@ {"vbitrate", &(conf_vbitrate), CONF_TYPE_INT, CONF_RANGE, 1, 104857599, NULL}, {"init_vpts", &(conf_init_vpts), CONF_TYPE_INT, CONF_RANGE, 100, 700, NULL}, //2*frametime at 60fps {"init_apts", &(conf_init_apts), CONF_TYPE_INT, CONF_RANGE, 100, 700, NULL}, - {"init_adelay", &conf_init_adelay, CONF_TYPE_INT, CONF_RANGE, -32760, -1, NULL}, + {"vdelay", &conf_init_adelay, CONF_TYPE_INT, CONF_RANGE, 1, 32760, NULL}, {"drop", &conf_drop, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"tsaf", &conf_ts_allframes, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"skip_padding", &conf_skip_padding, CONF_TYPE_FLAG, 0, 0, 1, NULL}, @@ -2418,7 +2418,7 @@ priv->scr = muxer->file_end = 0; if(conf_init_adelay) - priv->init_adelay = (double) conf_init_adelay / (double) 1000.0; + priv->init_adelay = - (double) conf_init_adelay / (double) 1000.0; priv->drop = conf_drop;