Merge commit '4d330da006fe48178a4c8047f06270925eaedf63'
authorJames Almer <jamrial@gmail.com>
Tue, 7 Nov 2017 19:29:02 +0000 (16:29 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 7 Nov 2017 19:29:02 +0000 (16:29 -0300)
commit514dda60703aed269debe1a099644c1114b452e6
tree970576ec3617cfa8adb522f1a56e8676cb253df7
parent15c632719a5f781fdd11a68cdad5eeb9ee5392b8
parent4d330da006fe48178a4c8047f06270925eaedf63
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>
libavformat/os_support.h