[FFmpeg-cvslog] Merge commit '4d330da006fe48178a4c8047f06270925eaedf63'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Nov  7 16:29:02 2017 -0300| [514dda60703aed269debe1a099644c1114b452e6] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=514dda60703aed269debe1a099644c1114b452e6
---

 libavformat/os_support.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 91220e9716..ca995f9de6 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;


======================================================================