diff options
| -rw-r--r-- | ass_mp.c | 2 | ||||
| -rw-r--r-- | mencoder.c | 2 | ||||
| -rw-r--r-- | stream/open.c | 2 | ||||
| -rw-r--r-- | subreader.c | 3 |
4 files changed, 5 insertions, 4 deletions
@@ -239,7 +239,7 @@ ASS_Track *ass_read_stream(ASS_Library *library, const char *fname, char *charse size_t buf_alloc = 0; stream_t *fd; - fd = open_stream(fname, NULL, &i); + fd = open_stream(fname, NULL, NULL); if (!fd) // Stream code should have printed an error already return NULL; diff --git a/mencoder.c b/mencoder.c index 2c4f203317..960799f67f 100644 --- a/mencoder.c +++ b/mencoder.c @@ -667,7 +667,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ if (frameno_filename) { - stream2=open_stream(frameno_filename,0,&i); + stream2=open_stream(frameno_filename, NULL, NULL); if(stream2){ demuxer2=demux_open(&opts, stream2,DEMUXER_TYPE_AVI,-1,-1,-2,NULL); if(demuxer2) mp_tmsg(MSGT_MENCODER, MSGL_INFO, "Using pass3 control file: %s\n", frameno_filename); diff --git a/stream/open.c b/stream/open.c index f5cf71fae8..ce0a415ceb 100644 --- a/stream/open.c +++ b/stream/open.c @@ -47,6 +47,8 @@ int dvd_title=0; stream_t* open_stream(const char *filename, struct MPOpts *options, int *file_format) { + if (!file_format) + file_format = &(int){DEMUXER_TYPE_UNKNOWN}; // Check if playlist or unknown if (*file_format != DEMUXER_TYPE_PLAYLIST){ *file_format=DEMUXER_TYPE_UNKNOWN; diff --git a/subreader.c b/subreader.c index 772d58c79c..6eb1b6d656 100644 --- a/subreader.c +++ b/subreader.c @@ -1382,8 +1382,7 @@ sub_data* sub_read_file (char *filename, float fps) { const struct subreader *srp; if(filename==NULL) return NULL; //qnx segfault - i = 0; - fd=open_stream (filename, NULL, &i); if (!fd) return NULL; + fd=open_stream (filename, NULL, NULL); if (!fd) return NULL; sub_format = SUB_INVALID; for (utf16 = 0; sub_format == SUB_INVALID && utf16 < 3; utf16++) { |