| @@ -39,6 +39,7 @@ · 38 unmodified lines |
| 39 | 39 | #include "libavutil/avstring.h" |
| 40 | 40 | #include "libavutil/channel_layout.h" |
| 41 | 41 | #include "libavutil/display.h" |
| 42 | +#include "libavutil/getenv_utf8.h" |
| 42 | 43 | #include "libavutil/mathematics.h" |
| 43 | 44 | #include "libavutil/imgutils.h" |
| 44 | 45 | #include "libavutil/libm.h" |
| @@ -47,9 +48,11 @@ · 2 unmodified lines |
| 47 | 48 | #include "libavutil/dict.h" |
| 48 | 49 | #include "libavutil/opt.h" |
| 49 | 50 | #include "cmdutils.h" |
| 51 | +#include "fopen_utf8.h" |
| 50 | 52 | #include "opt_common.h" |
| 51 | 53 | #ifdef _WIN32 |
| 52 | 54 | #include <windows.h> |
| 55 | +#include "compat/w32dlfcn.h" |
| 53 | 56 | #endif |
| 54 | 57 | |
| 55 | 58 | AVDictionary *sws_dict; |
| @@ -465,7 +468,7 @@ static void check_options(const OptionDef *po) · 409 unmodified lines |
| 465 | 468 | void parse_loglevel(int argc, char **argv, const OptionDef *options) |
| 466 | 469 | { |
| 467 | 470 | int idx = locate_option(argc, argv, options, "loglevel"); |
| 468 | | − const char *env; |
| 471 | + char *env; |
| 469 | 472 | |
| 470 | 473 | check_options(options); |
| 471 | 474 | |
| @@ -474,7 +477,8 @@ void parse_loglevel(int argc, char **argv, const OptionDef *options) · 2 unmodified lines |
| 474 | 477 | if (idx && argv[idx + 1]) |
| 475 | 478 | opt_loglevel(NULL, "loglevel", argv[idx + 1]); |
| 476 | 479 | idx = locate_option(argc, argv, options, "report"); |
| 477 | | − if ((env = getenv("FFREPORT")) || idx) { |
| 480 | + env = getenv_utf8("FFREPORT"); |
| 481 | + if (env || idx) { |
| 478 | 482 | FILE *report_file = NULL; |
| 479 | 483 | init_report(env, &report_file); |
| 480 | 484 | if (report_file) { |
| @@ -487,6 +491,7 @@ void parse_loglevel(int argc, char **argv, const OptionDef *options) · 6 unmodified lines |
| 487 | 491 | fflush(report_file); |
| 488 | 492 | } |
| 489 | 493 | } |
| 494 | + freeenv_utf8(env); |
| 490 | 495 | idx = locate_option(argc, argv, options, "hide_banner"); |
| 491 | 496 | if (idx) |
| 492 | 497 | hide_banner = 1; |
| @@ -812,28 +817,45 @@ FILE *get_preset_file(char *filename, size_t filename_size, · 319 unmodified lines |
| 812 | 817 | { |
| 813 | 818 | FILE *f = NULL; |
| 814 | 819 | int i; |
| 815 | | − const char *base[3] = { getenv("FFMPEG_DATADIR"), |
| 816 | | − getenv("HOME"), |
| 820 | +#if HAVE_GETMODULEHANDLE && defined(_WIN32) |
| 821 | + char *datadir = NULL; |
| 822 | +#endif |
| 823 | + char *env_home = getenv_utf8("HOME"); |
| 824 | + char *env_ffmpeg_datadir = getenv_utf8("FFMPEG_DATADIR"); |
| 825 | + const char *base[3] = { env_home, |
| 826 | + env_ffmpeg_datadir, |
| 817 | 827 | FFMPEG_DATADIR, }; |
| 818 | 828 | |
| 819 | 829 | if (is_path) { |
| 820 | 830 | av_strlcpy(filename, preset_name, filename_size); |
| 821 | | − f = fopen(filename, "r"); |
| 831 | + f = fopen_utf8(filename, "r"); |
| 822 | 832 | } else { |
| 823 | 833 | #if HAVE_GETMODULEHANDLE && defined(_WIN32) |
| 824 | | − char datadir[MAX_PATH], *ls; |
| 834 | + wchar_t *datadir_w = get_module_filename(NULL); |
| 825 | 835 | base[2] = NULL; |
| 826 | 836 | |
| 827 | | − if (GetModuleFileNameA(GetModuleHandleA(NULL), datadir, sizeof(datadir) - 1)) |
| 837 | + if (wchartoutf8(datadir_w, &datadir)) |
| 838 | + datadir = NULL; |
| 839 | + av_free(datadir_w); |
| 840 | + |
| 841 | + if (datadir) |
| 828 | 842 | { |
| 829 | | − for (ls = datadir; ls < datadir + strlen(datadir); ls++) |
| 843 | + char *ls; |
| 844 | + for (ls = datadir; *ls; ls++) |
| 830 | 845 | if (*ls == '\\') *ls = '/'; |
| 831 | 846 | |
| 832 | 847 | if (ls = strrchr(datadir, '/')) |
| 833 | 848 | { |
| 834 | | − *ls = 0; |
| 835 | | − strncat(datadir, "/ffpresets", sizeof(datadir) - 1 - strlen(datadir)); |
| 836 | | − base[2] = datadir; |
| 849 | + ptrdiff_t datadir_len = ls - datadir; |
| 850 | + size_t desired_size = datadir_len + strlen("/ffpresets") + 1; |
| 851 | + char *new_datadir = av_realloc_array( |
| 852 | + datadir, desired_size, sizeof *datadir); |
| 853 | + if (new_datadir) { |
| 854 | + datadir = new_datadir; |
| 855 | + datadir[datadir_len] = 0; |
| 856 | + strncat(datadir, "/ffpresets", desired_size - 1 - datadir_len); |
| 857 | + base[2] = datadir; |
| 858 | + } |
| 837 | 859 | } |
| 838 | 860 | } |
| 839 | 861 | #endif |
| @@ -842,17 +864,22 @@ FILE *get_preset_file(char *filename, size_t filename_size, · 2 unmodified lines |
| 842 | 864 | continue; |
| 843 | 865 | snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], |
| 844 | 866 | i != 1 ? "" : "/.ffmpeg", preset_name); |
| 845 | | − f = fopen(filename, "r"); |
| 867 | + f = fopen_utf8(filename, "r"); |
| 846 | 868 | if (!f && codec_name) { |
| 847 | 869 | snprintf(filename, filename_size, |
| 848 | 870 | "%s%s/%s-%s.ffpreset", |
| 849 | 871 | base[i], i != 1 ? "" : "/.ffmpeg", codec_name, |
| 850 | 872 | preset_name); |
| 851 | | − f = fopen(filename, "r"); |
| 873 | + f = fopen_utf8(filename, "r"); |
| 852 | 874 | } |
| 853 | 875 | } |
| 854 | 876 | } |
| 855 | 877 | |
| 878 | +#if HAVE_GETMODULEHANDLE && defined(_WIN32) |
| 879 | + av_free(datadir); |
| 880 | +#endif |
| 881 | + freeenv_utf8(env_ffmpeg_datadir); |
| 882 | + freeenv_utf8(env_home); |
| 856 | 883 | return f; |
| 857 | 884 | } |
| 858 | 885 | |