Mercurial > mplayer.hg
changeset 18241:b19dada1aeeb
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
| author | rtognimp |
|---|---|
| date | Mon, 24 Apr 2006 10:36:29 +0000 |
| parents | da3115996a81 |
| children | caac2ca98168 |
| files | libmpdemux/demuxer.h libmpdemux/muxer.h |
| diffstat | 2 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)