diff options
author | He Yang <1160386205@qq.com> | 2021-03-20 23:32:15 +0800 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2021-04-13 19:34:33 +0300 |
commit | 707f9c9f475f612e196876708cdb5ead31f63525 (patch) | |
tree | 295fa84a00c2b199045dad9746b10ce7a1b26dcc | |
parent | 33db0cbfd08384d611370006a77675cc6b778d12 (diff) | |
download | ffmpeg-707f9c9f475f612e196876708cdb5ead31f63525.tar.gz |
libavdevice/gdigrab: fix capture of windows with non-ASCII titles
Properly convert the UTF-8 input string to Windows wchar, and
utilize the wchar version of FindWindow.
Signed-off-by: He Yang <1160386205@qq.com>
-rw-r--r-- | libavdevice/gdigrab.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavdevice/gdigrab.c b/libavdevice/gdigrab.c index 9b2c55fe90..7688370643 100644 --- a/libavdevice/gdigrab.c +++ b/libavdevice/gdigrab.c @@ -32,6 +32,7 @@ #include "libavformat/internal.h" #include "libavutil/opt.h" #include "libavutil/time.h" +#include "libavutil/wchar_filename.h" #include <windows.h> /** @@ -245,8 +246,20 @@ gdigrab_read_header(AVFormatContext *s1) int ret; if (!strncmp(filename, "title=", 6)) { + wchar_t *name_w = NULL; name = filename + 6; - hwnd = FindWindow(NULL, name); + + if(utf8towchar(name, &name_w)) { + ret = AVERROR(errno); + goto error; + } + if(!name_w) { + ret = AVERROR(EINVAL); + goto error; + } + + hwnd = FindWindowW(NULL, name_w); + av_freep(&name_w); if (!hwnd) { av_log(s1, AV_LOG_ERROR, "Can't find window '%s', aborting.\n", name); |