summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libmpdemux/demux_audio.c2
-rw-r--r--libmpdemux/demux_avi.c6
-rw-r--r--libmpdemux/demux_lavf.c2
-rw-r--r--libmpdemux/muxer_lavf.c2
-rw-r--r--stream/http.c2
-rw-r--r--stream/stream.c8
-rw-r--r--stream/stream.h10
-rw-r--r--stream/stream_cue.c2
-rw-r--r--stream/stream_dvd.c2
-rw-r--r--stream/stream_dvdnav.c2
-rw-r--r--stream/stream_file.c2
-rw-r--r--stream/stream_netstream.c2
-rw-r--r--stream/stream_smb.c2
-rw-r--r--subreader.c2
14 files changed, 23 insertions, 23 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c
index 726f42bf8b..5b38fae206 100644
--- a/libmpdemux/demux_audio.c
+++ b/libmpdemux/demux_audio.c
@@ -346,7 +346,7 @@ static int demux_audio_open(demuxer_t* demuxer) {
sh_audio->i_bps = sh_audio->wf->nAvgBytesPerSec;
free(mp3_found);
mp3_found = NULL;
- if(s->end_pos && (s->flags & STREAM_SEEK) == STREAM_SEEK) {
+ if(s->end_pos && (s->flags & MP_STREAM_SEEK) == MP_STREAM_SEEK) {
char tag[4];
stream_seek(s,s->end_pos-128);
stream_read(s,tag,3);
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index 97c3c387c2..2024f8aa62 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -237,7 +237,7 @@ do{
}
pos = (off_t)priv->idx_offset+AVI_IDX_OFFSET(idx);
- if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & STREAM_SEEK)){
+ if((pos<demux->movi_start || pos>=demux->movi_end) && (demux->movi_end>demux->movi_start) && (demux->stream->flags & MP_STREAM_SEEK)){
mp_msg(MSGT_DEMUX,MSGL_V,"ChunkOffset out of range! idx=0x%"PRIX64" \n",(int64_t)pos);
continue;
}
@@ -262,7 +262,7 @@ do{
if(!(idx->dwFlags&AVIIF_KEYFRAME)) flags=0;
} else {
demux->filepos=stream_tell(demux->stream);
- if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->flags & STREAM_SEEK)){
+ if(demux->filepos>=demux->movi_end && demux->movi_end>demux->movi_start && (demux->stream->flags & MP_STREAM_SEEK)){
demux->stream->eof=1;
return 0;
}
@@ -442,7 +442,7 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){
demuxer->priv=(void*)priv;
//---- AVI header:
- read_avi_header(demuxer,(demuxer->stream->flags & STREAM_SEEK_BW)?index_mode:-2);
+ read_avi_header(demuxer,(demuxer->stream->flags & MP_STREAM_SEEK_BW)?index_mode:-2);
if(demuxer->audio->id>=0 && !demuxer->a_streams[demuxer->audio->id]){
mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_InvalidAudioStreamNosound,demuxer->audio->id);
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index c7c0c12cbf..a3b73ce531 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -465,7 +465,7 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
priv->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 0,
demuxer->stream, mp_read, NULL, mp_seek);
- priv->pb->is_streamed = !demuxer->stream->end_pos || (demuxer->stream->flags & STREAM_SEEK) != STREAM_SEEK;
+ priv->pb->is_streamed = !demuxer->stream->end_pos || (demuxer->stream->flags & MP_STREAM_SEEK) != MP_STREAM_SEEK;
if(av_open_input_stream(&avfc, priv->pb, mp_filename, priv->avif, &ap)<0){
mp_msg(MSGT_HEADER,MSGL_ERR,"LAVF_header: av_open_input_stream() failed\n");
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index 5026d5c912..f531423979 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -391,7 +391,7 @@ int muxer_init_muxer_lavf(muxer_t *muxer)
}
priv->oc->pb = av_alloc_put_byte(priv->buffer, BIO_BUFFER_SIZE, 1, muxer, NULL, mp_write, mp_seek);
- if ((muxer->stream->flags & STREAM_SEEK) != STREAM_SEEK)
+ if ((muxer->stream->flags & MP_STREAM_SEEK) != MP_STREAM_SEEK)
priv->oc->pb->is_streamed = 1;
muxer->priv = (void *) priv;
diff --git a/stream/http.c b/stream/http.c
index 498e40473c..3ebfe03d05 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -891,7 +891,7 @@ static int fixup_open(stream_t *stream,int seekable) {
stream->type = STREAMTYPE_STREAM;
if(!is_icy && !is_ultravox && seekable)
{
- stream->flags |= STREAM_SEEK;
+ stream->flags |= MP_STREAM_SEEK;
stream->seek = http_seek;
}
stream->streaming_ctrl->bandwidth = network_bandwidth;
diff --git a/stream/stream.c b/stream/stream.c
index 072e9d0a89..ed41b3e93a 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -174,10 +174,10 @@ stream_t* open_stream_plugin(const stream_info_t* sinfo,char* filename,int mode,
}
if(s->type <= -2)
mp_msg(MSGT_OPEN,MSGL_WARN, "Warning streams need a type !!!!\n");
- if(s->flags & STREAM_SEEK && !s->seek)
- s->flags &= ~STREAM_SEEK;
- if(s->seek && !(s->flags & STREAM_SEEK))
- s->flags |= STREAM_SEEK;
+ if(s->flags & MP_STREAM_SEEK && !s->seek)
+ s->flags &= ~MP_STREAM_SEEK;
+ if(s->seek && !(s->flags & MP_STREAM_SEEK))
+ s->flags |= MP_STREAM_SEEK;
s->mode = mode;
diff --git a/stream/stream.h b/stream/stream.h
index 4aed24526a..4da8a1ae43 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -37,10 +37,10 @@
#define STREAM_READ 0
#define STREAM_WRITE 1
/// Seek flags, if not mannualy set and s->seek isn't NULL
-/// STREAM_SEEK is automaticly set
-#define STREAM_SEEK_BW 2
-#define STREAM_SEEK_FW 4
-#define STREAM_SEEK (STREAM_SEEK_BW|STREAM_SEEK_FW)
+/// MP_STREAM_SEEK is automaticly set
+#define MP_STREAM_SEEK_BW 2
+#define MP_STREAM_SEEK_FW 4
+#define MP_STREAM_SEEK (MP_STREAM_SEEK_BW|MP_STREAM_SEEK_FW)
/** This is a HACK for live555 that does not respect the
separation between stream an demuxer and thus is not
actually a stream cache can not be used */
@@ -276,7 +276,7 @@ inline static int stream_seek(stream_t *s,off_t pos){
}
inline static int stream_skip(stream_t *s,off_t len){
- if( (len<0 && (s->flags & STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & STREAM_SEEK_FW)) ) {
+ if( (len<0 && (s->flags & MP_STREAM_SEEK_BW)) || (len>2*STREAM_BUFFER_SIZE && (s->flags & MP_STREAM_SEEK_FW)) ) {
// negative or big skip!
return stream_seek(s,stream_tell(s)+len);
}
diff --git a/stream/stream_cue.c b/stream/stream_cue.c
index ea9337afb1..53cb01299b 100644
--- a/stream/stream_cue.c
+++ b/stream/stream_cue.c
@@ -578,7 +578,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
stream->fd = f;
stream->type = STREAMTYPE_VCDBINCUE;
stream->sector_size = VCD_SECTOR_DATA;
- stream->flags = STREAM_READ | STREAM_SEEK_FW;
+ stream->flags = STREAM_READ | MP_STREAM_SEEK_FW;
stream->start_pos = ret;
stream->end_pos = ret2;
stream->fill_buffer = cue_vcd_read;
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 46e7100ec1..a9b377a340 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -978,7 +978,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
// return NULL;
stream->type = STREAMTYPE_DVD;
stream->sector_size = 2048;
- stream->flags = STREAM_READ | STREAM_SEEK;
+ stream->flags = STREAM_READ | MP_STREAM_SEEK;
stream->fill_buffer = fill_buffer;
stream->seek = seek;
stream->control = control;
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 9962c0606f..1d74504fa5 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -596,7 +596,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
dvdnav_angle_change(priv->dvdnav, dvd_angle);
stream->sector_size = 2048;
- stream->flags = STREAM_READ | STREAM_SEEK;
+ stream->flags = STREAM_READ | MP_STREAM_SEEK;
stream->fill_buffer = fill_buffer;
stream->seek = seek;
stream->control = control;
diff --git a/stream/stream_file.c b/stream/stream_file.c
index e113e6788e..9a4d7a3500 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -159,7 +159,7 @@ static int open_f(stream_t *stream,int mode, void* opts, int* file_format) {
#endif
if(mode == STREAM_READ) stream->seek = seek_forward;
stream->type = STREAMTYPE_STREAM; // Must be move to STREAMTYPE_FILE
- stream->flags |= STREAM_SEEK_FW;
+ stream->flags |= MP_STREAM_SEEK_FW;
} else if(len >= 0) {
stream->seek = seek;
stream->end_pos = len;
diff --git a/stream/stream_netstream.c b/stream/stream_netstream.c
index ea410c41e7..c0a80689df 100644
--- a/stream/stream_netstream.c
+++ b/stream/stream_netstream.c
@@ -279,7 +279,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
stream->fill_buffer = fill_buffer;
stream->control = control;
- if(stream->flags & STREAM_SEEK)
+ if(stream->flags & MP_STREAM_SEEK)
stream->seek = seek;
stream->close = close_s;
diff --git a/stream/stream_smb.c b/stream/stream_smb.c
index 17ba027687..86bb3f84b0 100644
--- a/stream/stream_smb.c
+++ b/stream/stream_smb.c
@@ -138,7 +138,7 @@ static int open_f (stream_t *stream, int mode, void *opts, int* file_format) {
smbc_lseek (fd, 0, SEEK_SET);
}
if(len > 0 || mode == STREAM_WRITE) {
- stream->flags |= STREAM_SEEK;
+ stream->flags |= MP_STREAM_SEEK;
stream->seek = seek;
if(mode == STREAM_READ) stream->end_pos = len;
}
diff --git a/subreader.c b/subreader.c
index 8cbe7311a5..0776ea2b17 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1085,7 +1085,7 @@ void subcp_open (stream_t *st)
char enca_lang[3], enca_fallback[100];
if (sscanf(sub_cp, "enca:%2s:%99s", enca_lang, enca_fallback) == 2
|| sscanf(sub_cp, "ENCA:%2s:%99s", enca_lang, enca_fallback) == 2) {
- if (st && st->flags & STREAM_SEEK ) {
+ if (st && st->flags & MP_STREAM_SEEK ) {
cp_tmp = guess_cp(st, enca_lang, enca_fallback);
} else {
cp_tmp = enca_fallback;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 01:21:19 +0000