summaryrefslogtreecommitdiffstats
path: root/subreader.c
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 /subreader.c
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 'subreader.c')
-rw-r--r--subreader.c3
1 files changed, 1 insertions, 2 deletions
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++) {