diff options
author | 2005-02-25 07:46:44 +0000 | |
---|---|---|
committer | 2005-02-25 07:46:44 +0000 | |
commit | c63785ae652471a92bbb294e4b22ccb6e62ad133 (patch) | |
tree | f8da9706eff4205efd75c8c9809fd725d10e35f1 | |
parent | ea6a892456ddd6999fa04e28e09e0b46ade0fedb (diff) |
both reorder and noreorder flags are now available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14810 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | DOCS/man/en/mplayer.1 | 4 | ||||
-rw-r--r-- | libmpdemux/muxer_mpeg.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 43f39e5f84..35cc75603a 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -7886,6 +7886,10 @@ were stored incorrectly. Works only with MPEG-1/2 video. . .TP +.B noreorder +Disables the above mentioned frame reordering code. +. +.TP .B init_vpts=<100\-700> initial video pts, in milliseconds (default: 200) . diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index f488218bc7..a43e8fe5ff 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -172,6 +172,7 @@ m_option_t mpegopts_conf[] = { {"tsaf", &conf_ts_allframes, 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}, + {"noreorder", &conf_reorder, CONF_TYPE_FLAG, 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; else if(priv->is_xsvcd) spriv->min_pes_hlen = 22; - if(conf_reorder) - spriv->reorder = 1; - else - spriv->reorder = 0; + spriv->reorder = conf_reorder; mp_msg (MSGT_MUXER, MSGL_DBG2, "Added video stream %d, ckid=%X\n", muxer->num_videos, s->ckid); } else { // MUXER_TYPE_AUDIO spriv->type = 0; |