Browse Source

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>
tags/n4.0
James Almer 8 years ago
parent
commit
514dda6070
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavformat/os_support.h

+ 1
- 1
libavformat/os_support.h View File

@@ -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;


Loading…
Cancel
Save