[MPlayer-cvslog] CVS: main/libmpdemux muxer_mpeg.c,1.11,1.12

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	muxer_mpeg.c 
Log Message:
100l wrong binary operator when setting progressive frame

Index: muxer_mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- muxer_mpeg.c	1 Mar 2005 20:56:43 -0000	1.11
+++ muxer_mpeg.c	1 Mar 2005 21:04:09 -0000	1.12
@@ -1845,7 +1845,7 @@
 	rff = (vpriv->trf & 0x1) ? 0x2 : 0;
 	mp_msg(MSGT_MUXER, MSGL_V, "\nTFF: %d, RFF: %d\n", tff >> 7, rff >> 1);
 	pce_ptr[3] = (pce_ptr[3] & 0xfd) | tff | rff;
-	pce_ptr[4] &= 0x80;	//sets progressive frame
+	pce_ptr[4] |= 0x80;	//sets progressive frame
 	
 	if(! vpriv->vframes)
 		mp_msg(MSGT_MUXER, MSGL_INFO, "\nENABLED SOFT TELECINING, FPS=%s, INITIAL PATTERN IS TFF:%d, RFF:%d\n",