diff options
| author |  nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-22 21:49:08 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-22 21:49:08 +0000 |
| commit | e23435af4a7f148f2c6d4a8e17c48b37b0a0e234 (patch) | |
| tree | 98f98204019808458f618143a6e33203082dd3c7 | |
| parent | 0b151b7ea904b61c30c528a77ef1b4275dd8ffa7 (diff) | |
renamed init_adelay to vdelay with opposite range
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14773 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 4 | ||||
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 47b03901a5..9406484bc9 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -7635,8 +7635,8 @@ initial video pts, in milliseconds (default: 200) 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 diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index b514ea08e8..1546ccd448 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -167,7 +167,7 @@ m_option_t mpegopts_conf[] = { {"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 @@ int muxer_init_muxer_mpeg(muxer_t *muxer){ 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; |