summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demuxer.h6
-rw-r--r--libmpdemux/stream.h5
2 files changed, 5 insertions, 6 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 417c43e546..5db46fd8b2 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -96,13 +96,13 @@ typedef struct demuxer_info_st {
#define MAX_V_STREAMS 256
typedef struct demuxer_st {
+ off_t filepos; // input stream current pos.
+ off_t movi_start;
+ off_t movi_end;
stream_t *stream;
int synced; // stream synced (used by mpeg)
- off_t filepos; // input stream current pos.
int type; // demuxer type: mpeg PS, mpeg ES, avi, avi-ni, avi-nini, asf
int file_format; // file format: mpeg/avi/asf
- off_t movi_start;
- off_t movi_end;
int seekable; // flag
//
demux_stream_t *audio; // audio buffer/demuxer
diff --git a/libmpdemux/stream.h b/libmpdemux/stream.h
index c5d4dc465f..1676db2156 100644
--- a/libmpdemux/stream.h
+++ b/libmpdemux/stream.h
@@ -35,11 +35,10 @@ void vcd_cache_init(int s);
typedef struct {
int fd;
- off_t pos;
- int eof;
int type; // 0=file 1=VCD
unsigned int buf_pos,buf_len;
- off_t start_pos,end_pos;
+ off_t pos,start_pos,end_pos;
+ int eof;
unsigned int cache_pid;
void* cache_data;
void* priv; // used for DVD