summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-08-10 13:23:04 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:15:48 +0200
commita62d145bdf549bbd90a97b9fc39385a13ea0471d (patch)
treeaac36242728b4c46e83321cda8a1bc48a06653fc /stream
parentfb46c7bdbea4548f830843deffdd6136cb39e9f9 (diff)
downloadmpv-a62d145bdf549bbd90a97b9fc39385a13ea0471d.tar.bz2
mpv-a62d145bdf549bbd90a97b9fc39385a13ea0471d.tar.xz
Simplify code: make open_stream() accept NULL file_format argument
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31952 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/open.c2
1 files changed, 2 insertions, 0 deletions
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;