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.c | |
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.c')
-rw-r--r-- | stream/stream.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/stream/stream.c b/stream/stream.c index 562675cb29..af194f3a3d 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -142,7 +142,8 @@ static const stream_info_t* const auto_open_streams[] = { NULL }; -static stream_t *open_stream_plugin(const stream_info_t *sinfo, char *filename, +static stream_t *open_stream_plugin(const stream_info_t *sinfo, + const char *filename, int mode, struct MPOpts *options, int *file_format, int *ret, char **redirected_url) @@ -202,8 +203,8 @@ static stream_t *open_stream_plugin(const stream_info_t *sinfo, char *filename, } -stream_t *open_stream_full(char *filename,int mode, struct MPOpts *options, - int* file_format) +stream_t *open_stream_full(const char *filename, int mode, + struct MPOpts *options, int *file_format) { int i,j,l,r; const stream_info_t* sinfo; @@ -246,7 +247,7 @@ stream_t *open_stream_full(char *filename,int mode, struct MPOpts *options, return NULL; } -stream_t *open_output_stream(char *filename, struct MPOpts *options) +stream_t *open_output_stream(const char *filename, struct MPOpts *options) { int file_format; //unused if(!filename) { |