FS-11394: [mod_av] Enable HW acceleration on Windows. Use FFmpeg 3.4.4 instead of libav.

This commit is contained in:
Andrey Volk committed 2018-09-19 19:16:36 +03:00
1 parent 122983e107
commit 0b2f72ff97
10 files changed
+6078 -7

No files matched your search

+2 -2
View File
@@ -710,8 +710,8 @@ void rtp_callback(struct AVCodecContext *avctx, void *data, int size, int mb_nb)
}
#endif
const uint8_t *fs_h263_find_resync_marker_reverse(const uint8_t *restrict start,
const uint8_t *restrict end)
const uint8_t *fs_h263_find_resync_marker_reverse(const uint8_t *av_restrict start,
const uint8_t *av_restrict end)
{
const uint8_t *p = end - 1;
start += 1; /* Make sure we never return the original start. */
@@ -46,7 +46,7 @@
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(SolutionDir)w32\libav.props" />
<Import Project="$(SolutionDir)w32\ffmpeg.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
@@ -141,9 +141,8 @@
<ClCompile Include="mod_av.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\libs\win32\libav\libav.2017.vcxproj">
<Project>{841C345F-FCC7-4F64-8F54-0281CEABEB01}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<ProjectReference Include="..\..\..\..\libs\win32\ffmpeg\ffmpeg.2017.vcxproj">
<Project>{bc1fd72e-1cd5-4525-a7f5-17c5740bfded}</Project>
</ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>