summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_pulse.c
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2013-09-19 20:08:34 +0200
committerwm4 <wm4@nowhere>2013-09-20 21:33:32 +0200
commit31a5fe6fa8af7356c2c99749c2363d7f364534eb (patch)
treee6e55d19d347d5acc0b0a9bd49b09ede25296673 /audio/out/ao_pulse.c
parent36fe16cc7ec31ba5033aed60cc70031b7ce4e348 (diff)
downloadmpv-31a5fe6fa8af7356c2c99749c2363d7f364534eb.tar.bz2
mpv-31a5fe6fa8af7356c2c99749c2363d7f364534eb.tar.xz
x11_common: fix behavior if XCreateIC() fails
This consists of 3 commits squashed and cherry-picked from master (there were some minor conflicts): vo/x11_common: Fail init with no valid XIM XOpenIM can fail to find a valid input method, in which case it returns NULL. Passing a NULL pointer to XCreateIC would cause a crash, so fail VO init before that happens. vo/x11_common: remove superfluous msg prefixes Conflicts: video/out/x11_common.c vo/x11_common: don't require a working input method Normally, we need this for Xutf8LookupString(). But we can just fall back to XLookupString(). In fact, the code for this was already there, the code was just never tested and was actually crashing when active (see commit 2115c4a).
Diffstat (limited to 'audio/out/ao_pulse.c')
0 files changed, 0 insertions, 0 deletions