diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/asf.h | 2 | ||||
-rw-r--r-- | libmpdemux/asf_streaming.c | 2 | ||||
-rw-r--r-- | libmpdemux/aviprint.c | 2 | ||||
-rw-r--r-- | libmpdemux/aviwrite.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_mov.c | 1 | ||||
-rw-r--r-- | libmpdemux/demux_mpg.c | 4 | ||||
-rw-r--r-- | libmpdemux/demuxer.h | 8 | ||||
-rw-r--r-- | libmpdemux/dvdauth.h | 1 | ||||
-rw-r--r-- | libmpdemux/network.c | 2 | ||||
-rw-r--r-- | libmpdemux/parse_es.c | 1 | ||||
-rw-r--r-- | libmpdemux/stream.h | 7 | ||||
-rw-r--r-- | libmpdemux/test.c | 1 |
12 files changed, 25 insertions, 8 deletions
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index 6a0391c745..eabd9b54c8 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -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 diff --git a/libmpdemux/asf_streaming.c b/libmpdemux/asf_streaming.c index 3008370441..1438feb32d 100644 --- a/libmpdemux/asf_streaming.c +++ b/libmpdemux/asf_streaming.c @@ -3,6 +3,8 @@ #include <string.h> #include <unistd.h> +#include "config.h" + #include "url.h" #include "http.h" #include "asf.h" diff --git a/libmpdemux/aviprint.c b/libmpdemux/aviprint.c index c2d5c3b910..69f2cfa06d 100644 --- a/libmpdemux/aviprint.c +++ b/libmpdemux/aviprint.c @@ -3,6 +3,8 @@ #include <stdlib.h> #include <unistd.h> +#include "config.h" + #include "stream.h" #include "demuxer.h" diff --git a/libmpdemux/aviwrite.c b/libmpdemux/aviwrite.c index 8b62cdc5be..df8dda180d 100644 --- a/libmpdemux/aviwrite.c +++ b/libmpdemux/aviwrite.c @@ -3,6 +3,8 @@ #include <stdlib.h> #include <string.h> +#include "config.h" + //#include "stream.h" //#include "demuxer.h" //#include "stheader.h" diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 6d980621c8..c4a9abeafa 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -9,7 +9,6 @@ #include <unistd.h> #include "config.h" - #include "mp_msg.h" #include "help_mp.h" diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index c9faabc0da..ece051f812 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -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) diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 17661fe716..ed02dc32e5 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -1,6 +1,4 @@ -#include "config.h" - #define MAX_PACKS 4096 #define MAX_PACK_BYTES 0x800000 @@ -153,5 +151,11 @@ static inline int avi_stream_id(unsigned int id){ 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; + + diff --git a/libmpdemux/dvdauth.h b/libmpdemux/dvdauth.h index 68ad752c0a..8672ce17af 100644 --- a/libmpdemux/dvdauth.h +++ b/libmpdemux/dvdauth.h @@ -1,4 +1,3 @@ -//#include "config.h" #ifdef HAVE_LIBCSS #ifndef _MPLAYER_CSS_H #define _MPLAYER_CSS_H diff --git a/libmpdemux/network.c b/libmpdemux/network.c index c80c49376e..523943b80f 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -24,6 +24,8 @@ #include <errno.h> #include <ctype.h> +#include "config.h" + #include "stream.h" #include "demuxer.h" diff --git a/libmpdemux/parse_es.c b/libmpdemux/parse_es.c index a872bfffee..3b90bb7607 100644 --- a/libmpdemux/parse_es.c +++ b/libmpdemux/parse_es.c @@ -10,7 +10,6 @@ #include "stream.h" #include "demuxer.h" - #include "parse_es.h" //static unsigned char videobuffer[MAX_VIDEO_PACKET_SIZE]; diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h index 8a3c340989..46246e2bcd 100644 --- a/libmpdemux/stream.h +++ b/libmpdemux/stream.h @@ -149,5 +149,12 @@ void stream_reset(stream_t *s); 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 diff --git a/libmpdemux/test.c b/libmpdemux/test.c index 20c47a6cb1..e20c9d47c6 100644 --- a/libmpdemux/test.c +++ b/libmpdemux/test.c @@ -3,6 +3,7 @@ #include <stdlib.h> #include <string.h> +#include "config.h" #include "mp_msg.h" #include "stream.h" |