RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2012-09-01 20:09:51 +02:00
parent 128bc6a21e
commit f0b2c3dcd7
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/demux_lavf.c
View File

@ -44,7 +44,6 @@
#include "demuxer.h" #include "demuxer.h"
#include "stheader.h" #include "stheader.h"
#include "m_option.h" #include "m_option.h"
#include "sub/sub.h"
#include "mp_taglists.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) { } else if (id == demux->sub->id) {
// subtitle // subtitle
ds = demux->sub; ds = demux->sub;
sub_utf8 = 1;
} else { } else {
talloc_free(pkt); talloc_free(pkt);
return 1; return 1;

3
libmpdemux/demux_mkv.c
View File

@ -50,8 +50,6 @@
#include "mp_msg.h" #include "mp_msg.h"
#include "sub/sub.h"
static const unsigned char sipr_swaps[38][2] = { 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}, {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"); "lacing. This is abnormal and not supported.\n");
use_this_block = 0; use_this_block = 0;
} }
sub_utf8 = 1; // XXX this variable should be eventually removed
} else } else
use_this_block = 0; use_this_block = 0;