Mercurial > mplayer.hg
changeset 2555:66837325b929
config.h cleanup, few things added to steram/demuxer headers
| author | arpi |
|---|---|
| date | Tue, 30 Oct 2001 17:03:11 +0000 |
| parents | db9d31c4bf4c |
| children | 71934dc06490 |
| files | libmpdemux/asf.h libmpdemux/asf_streaming.c libmpdemux/aviprint.c libmpdemux/aviwrite.c libmpdemux/demux_mov.c libmpdemux/demux_mpg.c libmpdemux/demuxer.h libmpdemux/dvdauth.h libmpdemux/network.c libmpdemux/parse_es.c libmpdemux/stream.h libmpdemux/test.c |
| diffstat | 12 files changed, 25 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/asf.h Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/asf.h Tue Oct 30 17:03:11 2001 +0000 @@ -1,7 +1,7 @@ #ifndef __ASF_H #define __ASF_H -#include "config.h" /* for WORDS_BIGENDIAN */ +//#include "config.h" /* for WORDS_BIGENDIAN */ #include <inttypes.h> #include "bswap.h" #ifdef STREAMING
--- a/libmpdemux/asf_streaming.c Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/asf_streaming.c Tue Oct 30 17:03:11 2001 +0000 @@ -3,6 +3,8 @@ #include <string.h> #include <unistd.h> +#include "config.h" + #include "url.h" #include "http.h" #include "asf.h"
--- a/libmpdemux/aviprint.c Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/aviprint.c Tue Oct 30 17:03:11 2001 +0000 @@ -3,6 +3,8 @@ #include <stdlib.h> #include <unistd.h> +#include "config.h" + #include "stream.h" #include "demuxer.h"
--- a/libmpdemux/aviwrite.c Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/aviwrite.c Tue Oct 30 17:03:11 2001 +0000 @@ -3,6 +3,8 @@ #include <stdlib.h> #include <string.h> +#include "config.h" + //#include "stream.h" //#include "demuxer.h" //#include "stheader.h"
--- a/libmpdemux/demux_mov.c Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/demux_mov.c Tue Oct 30 17:03:11 2001 +0000 @@ -9,7 +9,6 @@ #include <unistd.h> #include "config.h" - #include "mp_msg.h" #include "help_mp.h"
--- a/libmpdemux/demux_mpg.c Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/demux_mpg.c Tue Oct 30 17:03:11 2001 +0000 @@ -8,13 +8,13 @@ #include "mp_msg.h" #include "help_mp.h" -#include "config.h" -#include "dvdauth.h" #include "stream.h" #include "demuxer.h" #include "parse_es.h" #include "stheader.h" +#include "dvdauth.h" + //#define MAX_PS_PACKETSIZE 2048 #define MAX_PS_PACKETSIZE (224*1024)
--- a/libmpdemux/demuxer.h Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/demuxer.h Tue Oct 30 17:03:11 2001 +0000 @@ -1,5 +1,3 @@ - -#include "config.h" #define MAX_PACKS 4096 #define MAX_PACK_BYTES 0x800000 @@ -153,5 +151,11 @@ demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid); int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); +// AVI demuxer params: +extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index +extern int force_ni; +extern int pts_from_bps; + +
--- a/libmpdemux/dvdauth.h Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/dvdauth.h Tue Oct 30 17:03:11 2001 +0000 @@ -1,4 +1,3 @@ -//#include "config.h" #ifdef HAVE_LIBCSS #ifndef _MPLAYER_CSS_H #define _MPLAYER_CSS_H
--- a/libmpdemux/network.c Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/network.c Tue Oct 30 17:03:11 2001 +0000 @@ -24,6 +24,8 @@ #include <errno.h> #include <ctype.h> +#include "config.h" + #include "stream.h" #include "demuxer.h"
--- a/libmpdemux/parse_es.c Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/parse_es.c Tue Oct 30 17:03:11 2001 +0000 @@ -10,7 +10,6 @@ #include "stream.h" #include "demuxer.h" - #include "parse_es.h" //static unsigned char videobuffer[MAX_VIDEO_PACKET_SIZE];
--- a/libmpdemux/stream.h Tue Oct 30 16:47:27 2001 +0000 +++ b/libmpdemux/stream.h Tue Oct 30 17:03:11 2001 +0000 @@ -149,5 +149,12 @@ stream_t* new_stream(int fd,int type); void free_stream(stream_t *s); stream_t* new_memory_stream(unsigned char* data,int len); +stream_t* open_stream(char* filename,int vcd_track,int* file_format); + +//#ifdef USE_DVDREAD +extern int dvd_title; +extern int dvd_chapter; +extern int dvd_angle; +//#endif #endif // __STREAM_H