diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:46:46 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:50:55 +0200 |
commit | e74708f6194ef0af2bdf37e857ed232027fa46ba (patch) | |
tree | f7b53476abeb1cc8ccbe1c49113e9722c51b7800 /stream/stream.h | |
parent | 2ad00b5319603b22f9b0858bb14d016f673157cb (diff) | |
parent | cb8796857c8bd851e3b97d729af149e3f003b851 (diff) | |
download | mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2 mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz |
Merge svn changes up to r30748
Diffstat (limited to 'stream/stream.h')
-rw-r--r-- | stream/stream.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/stream/stream.h b/stream/stream.h index c48dd2a8b2..c02961f1df 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -345,9 +345,11 @@ int stream_control(stream_t *s, int cmd, void *arg); 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, struct MPOpts *options,int* file_format); -stream_t* open_stream_full(char* filename,int mode, struct MPOpts *options, int* file_format); -stream_t* open_output_stream(char* filename,struct MPOpts *options); +stream_t *open_stream(const char *filename, struct MPOpts *options, + int *file_format); +stream_t *open_stream_full(const char *filename,int mode, + struct MPOpts *options, int *file_format); +stream_t *open_output_stream(const char *filename, struct MPOpts *options); /// Set the callback to be used by libstream to check for user /// interruption during long blocking operations (cache filling, etc). struct input_ctx; |