[MPlayer-cvslog] CVS: main/libmpdemux muxer_mpeg.c,1.7,1.8

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv8472

Modified Files:
	muxer_mpeg.c 
Log Message:
disabled by default frame reordering

Index: muxer_mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- muxer_mpeg.c	23 Feb 2005 07:30:37 -0000	1.7
+++ muxer_mpeg.c	24 Feb 2005 20:23:13 -0000	1.8
@@ -74,7 +74,7 @@
 static int conf_init_adelay = 0;
 static int conf_drop = 0;
 static int conf_skip_padding = 0;
-static int conf_noreorder = 0;
+static int conf_reorder = 0;
 
 enum FRAME_TYPE {
 	I_FRAME = 1,
@@ -171,7 +171,7 @@
 	{"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},
-	{"noreorder", &conf_noreorder, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"reorder", &conf_reorder, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -389,10 +389,10 @@
       spriv->min_pes_hlen = 18;
     else if(priv->is_xsvcd)
       spriv->min_pes_hlen = 22;
-    if(conf_noreorder)
-      spriv->reorder = 0;
-    else
+    if(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);
   } else { // MUXER_TYPE_AUDIO
     spriv->type = 0;