diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-04-22 16:13:55 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-04-23 05:41:45 +0300 |
| commit | 9790fc444efc423bb4b3f6ad5321eeb7aeeb0b54 (patch) | |
| tree | bb25e0d652ecc66e1f6330eb2e3272a6c3a73083 /libmpdemux | |
| parent | d6072d740826dd112eaeccc09c3f3bf46a8ece26 (diff) | |
| download | mpv-9790fc444efc423bb4b3f6ad5321eeb7aeeb0b54.tar.bz2 mpv-9790fc444efc423bb4b3f6ad5321eeb7aeeb0b54.tar.xz | |
demux_ogg: fix slang selection
Commit 59fff90d94 ("options: change -alang and -slang to use string
list type") failed to change demux_ogg accordingly. Add the missing
change.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_ogg.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index f2a5aa7059..08ed883d7b 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -346,19 +346,13 @@ static unsigned char *demux_ogg_read_packet(ogg_stream_t *os, ogg_packet *pack, } // check if clang has substring from comma separated langlist -static int demux_ogg_check_lang(const char *clang, const char *langlist) +static int demux_ogg_check_lang(const char *clang, char **langlist) { - const char *c; - - if (!langlist || !*langlist) + if (!langlist) return 0; - while ((c = strchr(langlist, ','))) { - if (!strncasecmp(clang, langlist, c - langlist)) + for (int i = 0; langlist[i]; i++) + if (!strncasecmp(clang, langlist[i], strlen(langlist[i]))) return 1; - langlist = &c[1]; - } - if (!strncasecmp(clang, langlist, strlen(langlist))) - return 1; return 0; } |