diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-07 16:29:02 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-07 16:29:02 -0300 |
| commit | 514dda60703aed269debe1a099644c1114b452e6 (patch) | |
| tree | 970576ec3617cfa8adb522f1a56e8676cb253df7 | |
| parent | 15c632719a5f781fdd11a68cdad5eeb9ee5392b8 (diff) | |
| parent | 4d330da006fe48178a4c8047f06270925eaedf63 (diff) | |
| download | ffmpeg-streaming-514dda60703aed269debe1a099644c1114b452e6.zip ffmpeg-streaming-514dda60703aed269debe1a099644c1114b452e6.tar.gz | |
Merge commit '4d330da006fe48178a4c8047f06270925eaedf63'
* commit '4d330da006fe48178a4c8047f06270925eaedf63':
os_support: Use HAVE_UWP instead of manually checking WINAPI_FAMILY
d3d11va: Check WINAPI_FAMILY instead of HAVE_LOADLIBRARY
lavf: Remove codec_tag from dashenc and smoothstreamingenc
hevc: Add support for alternative transfer characterics SEI
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/os_support.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 91220e9..ca995f9 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -220,7 +220,7 @@ static inline int win32_rename(const char *src_utf8, const char *dest_utf8) fallback: /* filename may be be in CP_ACP */ -#if !HAVE_WINRT +#if !HAVE_UWP ret = MoveFileExA(src_utf8, dest_utf8, MOVEFILE_REPLACE_EXISTING); if (ret) errno = EPERM; |
