summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-16 22:07:48 +0200
committerwm4 <wm4@nowhere>2013-06-16 22:07:48 +0200
commitd81b71c7f7cb6f5b3a047fbfeeb41d4888e7c5b6 (patch)
tree0d50b238c1a798db9ef09838800c99653c06e408 /sub
parent4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6 (diff)
parentf794444309a826478fefa00bf13d660793066b81 (diff)
downloadmpv-d81b71c7f7cb6f5b3a047fbfeeb41d4888e7c5b6.tar.bz2
mpv-d81b71c7f7cb6f5b3a047fbfeeb41d4888e7c5b6.tar.xz
Merge branch 'cache_new'
Diffstat (limited to 'sub')
-rw-r--r--sub/subreader.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sub/subreader.c b/sub/subreader.c
index 8c5a259196..f3821ba5ab 100644
--- a/sub/subreader.c
+++ b/sub/subreader.c
@@ -1212,7 +1212,6 @@ static const char* guess_cp(stream_t *st, const char *preferred_language, const
detected_sub_cp = guess_buffer_cp(buffer, buflen, preferred_language, fallback);
free(buffer);
- stream_reset(st);
stream_seek(st,0);
return detected_sub_cp;
@@ -1255,7 +1254,6 @@ sub_data* sub_read_file(char *filename, float fps, struct MPOpts *opts)
int sub_format = SUB_INVALID;
for (utf16 = 0; sub_format == SUB_INVALID && utf16 < 3; utf16++) {
sub_format=sub_autodetect (fd, &uses_time, utf16);
- stream_reset(fd);
stream_seek(fd,0);
}
utf16--;