From 4b45ec30e4b8ced93aa10792aa18a8f96b3cd104 Mon Sep 17 00:00:00 2001 From: rtognimp Date: Mon, 24 Apr 2006 10:36:29 +0000 Subject: 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 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18242 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.h | 5 +---- libmpdemux/muxer.h | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 9eeff6e067..939a3b5577 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -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 --git a/libmpdemux/muxer.h b/libmpdemux/muxer.h index 273edf9176..7f3779d6d1 100644 --- a/libmpdemux/muxer.h +++ b/libmpdemux/muxer.h @@ -97,8 +97,6 @@ typedef struct muxbuf_t { 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) -- cgit v1.2.3