both reorder and noreorder flags are now available

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14810 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2005-02-25 07:46:44 +00:00
parent ea6a892456
commit c63785ae65
2 changed files with 6 additions and 4 deletions

View File

@ -7886,6 +7886,10 @@ were stored incorrectly.
Works only with MPEG-1/2 video. Works only with MPEG-1/2 video.
. .
.TP .TP
.B noreorder
Disables the above mentioned frame reordering code.
.
.TP
.B init_vpts=<100\-700> .B init_vpts=<100\-700>
initial video pts, in milliseconds (default: 200) initial video pts, in milliseconds (default: 200)
. .

View File

@ -172,6 +172,7 @@ m_option_t mpegopts_conf[] = {
{"tsaf", &conf_ts_allframes, 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}, {"skip_padding", &conf_skip_padding, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"reorder", &conf_reorder, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"reorder", &conf_reorder, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noreorder", &conf_reorder, CONF_TYPE_FLAG, 0, 0, 0, NULL},
{NULL, NULL, 0, 0, 0, 0, NULL} {NULL, NULL, 0, 0, 0, 0, NULL}
}; };
@ -389,10 +390,7 @@ static muxer_stream_t* mpegfile_new_stream(muxer_t *muxer,int type){
spriv->min_pes_hlen = 18; spriv->min_pes_hlen = 18;
else if(priv->is_xsvcd) else if(priv->is_xsvcd)
spriv->min_pes_hlen = 22; spriv->min_pes_hlen = 22;
if(conf_reorder) spriv->reorder = conf_reorder;
spriv->reorder = 1;
else
spriv->reorder = 0;
mp_msg (MSGT_MUXER, MSGL_DBG2, "Added video stream %d, ckid=%X\n", muxer->num_videos, s->ckid); mp_msg (MSGT_MUXER, MSGL_DBG2, "Added video stream %d, ckid=%X\n", muxer->num_videos, s->ckid);
} else { // MUXER_TYPE_AUDIO } else { // MUXER_TYPE_AUDIO
spriv->type = 0; spriv->type = 0;