diff options
| author | wm4 <wm4@nowhere> | 2012-09-01 20:09:51 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-09-18 21:04:46 +0200 |
| commit | f0b2c3dcd79885ed6c2e407b9d6d474968da8813 (patch) | |
| tree | 0f7f3abacb35eada3a1c611f8b4c277eae8e8e39 /libmpdemux | |
| parent | 128bc6a21e3306b8e8346aba439a3c4e2dcbcdc5 (diff) | |
| download | mpv-f0b2c3dcd79885ed6c2e407b9d6d474968da8813.tar.bz2 mpv-f0b2c3dcd79885ed6c2e407b9d6d474968da8813.tar.xz | |
demuxer: do not set sub_utf8 option
demux_lavf and demux_mkv, which both support demuxing subtitles, set
the global variable sub_utf8. This variable is connected with the -utf8
option, and should not be reset by code. Since demuxer subtitles are not
influenced by this option (anymore?), this is unnecessary. Remove the
code setting this variable from the demuxers.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_mkv.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 69cb0f02fc..5802f1068a 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -44,7 +44,6 @@ #include "demuxer.h" #include "stheader.h" #include "m_option.h" -#include "sub/sub.h" #include "mp_taglists.h" @@ -812,7 +811,6 @@ static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds) } else if (id == demux->sub->id) { // subtitle ds = demux->sub; - sub_utf8 = 1; } else { talloc_free(pkt); return 1; diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index aae4090ede..10427f8a82 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -50,8 +50,6 @@ #include "mp_msg.h" -#include "sub/sub.h" - static const unsigned char sipr_swaps[38][2] = { {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68}, @@ -2077,7 +2075,6 @@ static int handle_block(demuxer_t *demuxer, uint8_t *block, uint64_t length, "lacing. This is abnormal and not supported.\n"); use_this_block = 0; } - sub_utf8 = 1; // XXX this variable should be eventually removed } else use_this_block = 0; |