# HG changeset patch
# User rtognimp
# Date 1145874989 0
# Node ID b19dada1aeeba939fbf2758fbcfb4f2e08fb6155
# Parent  da3115996a81bddc077f1a9ac86307d1b9f146c8
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

diff -r da3115996a81 -r b19dada1aeeb libmpdemux/demuxer.h
--- a/libmpdemux/demuxer.h	Mon Apr 24 10:26:19 2006 +0000
+++ b/libmpdemux/demuxer.h	Mon Apr 24 10:36:29 2006 +0000
@@ -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
diff -r da3115996a81 -r b19dada1aeeb libmpdemux/muxer.h
--- a/libmpdemux/muxer.h	Mon Apr 24 10:26:19 2006 +0000
+++ b/libmpdemux/muxer.h	Mon Apr 24 10:36:29 2006 +0000
@@ -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)