# HG changeset patch # User nicodvb # Date 1109317604 0 # Node ID d5683a00b74cc0b5f04a7d089ec71e65b19819a7 # Parent 9d495b825bcd4d9df3562ba25733738c9b64b5f9 both reorder and noreorder flags are now available diff -r 9d495b825bcd -r d5683a00b74c DOCS/man/en/mplayer.1 --- a/DOCS/man/en/mplayer.1 Fri Feb 25 07:43:40 2005 +0000 +++ b/DOCS/man/en/mplayer.1 Fri Feb 25 07:46:44 2005 +0000 @@ -7886,6 +7886,10 @@ 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 -r 9d495b825bcd -r d5683a00b74c libmpdemux/muxer_mpeg.c --- a/libmpdemux/muxer_mpeg.c Fri Feb 25 07:43:40 2005 +0000 +++ b/libmpdemux/muxer_mpeg.c Fri Feb 25 07:46:44 2005 +0000 @@ -172,6 +172,7 @@ {"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 @@ 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;