[MPlayer-cvslog] CVS: main/libmpdemux demuxer.h, 1.91, 1.92 muxer.h, 1.20, 1.21

[Roberto Togni CVS]

CVS change done by Roberto Togni CVS

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

Modified Files:
	demuxer.h muxer.h 
Log Message:
3 - Move a definition of MP_NOPTS_VALUE from muxer.h to demuxer.h to
make it available in more files (needed for next patch).

Patch by Uoti Urpala


Index: demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- demuxer.h	17 Feb 2006 01:57:41 -0000	1.91
+++ demuxer.h	24 Apr 2006 10:36:29 -0000	1.92
@@ -61,10 +61,7 @@
 #define DEMUXER_TYPE_PLAYLIST (2<<16)
 
 
-#define DEMUXER_TIME_NONE 0
-#define DEMUXER_TIME_PTS 1
-#define DEMUXER_TIME_FILE 2
-#define DEMUXER_TIME_BPS 3
+#define MP_NOPTS_VALUE (-1LL<<63) //both int64_t and double should be able to represent this exactly
 
 
 // DEMUXER control commands/answers

Index: muxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- muxer.h	21 Feb 2006 09:40:25 -0000	1.20
+++ muxer.h	24 Apr 2006 10:36:29 -0000	1.21
@@ -97,8 +97,6 @@
   unsigned int flags;
 } muxbuf_t;
 
-#define MP_NOPTS_VALUE (-1LL<<63) //both int64_t and double should be able to represent this exactly
-
 muxer_t *muxer_new_muxer(int type,FILE *);
 #define muxer_new_stream(muxer,a) muxer->cont_new_stream(muxer,a)
 #define muxer_stream_fix_parameters(muxer, a) muxer->fix_stream_parameters(a)