From f0b2c3dcd79885ed6c2e407b9d6d474968da8813 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 1 Sep 2012 20:09:51 +0200 Subject: 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. --- libmpdemux/demux_mkv.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'libmpdemux/demux_mkv.c') 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; -- cgit v1.2.3