Message ID | pull.36.ffstaging.FFmpeg.1655163773842.ffmpegagent@gmail.com |
---|---|
State | Accepted |
Commit | fee765c2078ba03e346e311c86a447a116fe8c5f |
Headers | show |
Series | [FFmpeg-devel] fftools/fopen_utf8: support long paths on Windows for fftools | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_armv7_RPi4 | success | Make finished |
andriy/make_fate_armv7_RPi4 | success | Make fate finished |
On Mon, 13 Jun 2022, softworkz wrote: > From: softworkz <softworkz@hotmail.com> > > Signed-off-by: softworkz <softworkz@hotmail.com> > --- > fftools/fopen_utf8: support long paths on Windows for fftools > > After Nil's patchset, this is probably the final missing bit. > > Signed-off-by: softworkz softworkz@hotmail.com > > Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-36%2Fsoftworkz%2Fsubmit_fftools_long_paths-v1 > Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-36/softworkz/submit_fftools_long_paths-v1 > Pull-Request: https://github.com/ffstaging/FFmpeg/pull/36 > > fftools/fopen_utf8.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fftools/fopen_utf8.h b/fftools/fopen_utf8.h > index cd18fe8ce1..e5be84179a 100644 > --- a/fftools/fopen_utf8.h > +++ b/fftools/fopen_utf8.h > @@ -35,7 +35,7 @@ static inline FILE *fopen_utf8(const char *path_utf8, const char *mode) > FILE *f; > > /* convert UTF-8 to wide chars */ > - if (utf8towchar(path_utf8, &path_w)) /* This sets errno on error. */ > + if (get_extended_win32_path(path_utf8, &path_w)) /* This sets errno on error. */ > return NULL; > if (!path_w) > goto fallback; > > base-commit: 4d45f5acbd9ab55cd8d29d01843f28315ee27fee > -- > ffmpeg-codebot Looks ok, will push soon. // Martin
diff --git a/fftools/fopen_utf8.h b/fftools/fopen_utf8.h index cd18fe8ce1..e5be84179a 100644 --- a/fftools/fopen_utf8.h +++ b/fftools/fopen_utf8.h @@ -35,7 +35,7 @@ static inline FILE *fopen_utf8(const char *path_utf8, const char *mode) FILE *f; /* convert UTF-8 to wide chars */ - if (utf8towchar(path_utf8, &path_w)) /* This sets errno on error. */ + if (get_extended_win32_path(path_utf8, &path_w)) /* This sets errno on error. */ return NULL; if (!path_w) goto fallback;