Skip to content
This repository has been archived by the owner on May 31, 2022. It is now read-only.

Commit

Permalink
Add FFmpegUniversalSDK project for use this project easier.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MouriNaruto
MouriNaruto committed Feb 7, 2018
1 parent 8a334ac commit a52ce60
Show file tree
Hide file tree
Showing 9 changed files with 548 additions and 457 deletions.
10 changes: 10 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,13 @@
/Output
/FFmpeg
/FFmpegUniversal/FFmpeg
/FFmpegUniversalSDK/ARM
/FFmpegUniversalSDK/Win32
/FFmpegUniversalSDK/x64
/FFmpegUniversalSDK/libavcodec
/FFmpegUniversalSDK/libavdevice
/FFmpegUniversalSDK/libavfilter
/FFmpegUniversalSDK/libavformat
/FFmpegUniversalSDK/libavutil
/FFmpegUniversalSDK/libswresample
/FFmpegUniversalSDK/libswscale
10 changes: 10 additions & 0 deletions FFmpegBuild.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ popd
rd /s /q "%~dp0Output/FFmpeg"
rd /s /q "%~dp0Output/FFmpeg_Temp"
rd /s /q "%~dp0FFmpegUniversal/FFmpeg"
rd /s /q "%~dp0FFmpegUniversalSDK/ARM"
rd /s /q "%~dp0FFmpegUniversalSDK/Win32"
rd /s /q "%~dp0FFmpegUniversalSDK/x64"
rd /s /q "%~dp0FFmpegUniversalSDK/libavcodec"
rd /s /q "%~dp0FFmpegUniversalSDK/libavdevice"
rd /s /q "%~dp0FFmpegUniversalSDK/libavfilter"
rd /s /q "%~dp0FFmpegUniversalSDK/libavformat"
rd /s /q "%~dp0FFmpegUniversalSDK/libavutil"
rd /s /q "%~dp0FFmpegUniversalSDK/libswresample"
rd /s /q "%~dp0FFmpegUniversalSDK/libswscale"

echo Building FFmpeg for Windows 10 apps x86...
echo:
Expand Down
3 changes: 2 additions & 1 deletion FFmpegCopy.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

pushd %~dp0

xcopy /r /s /y Output\FFmpeg\Static\%1\include\*.* FFmpegUniversal\FFmpeg\Include\
xcopy /r /s /y Output\FFmpeg\Static\%1\include\*.* FFmpegUniversalSDK\

xcopy /r /s /y Output\FFmpeg\Static\%1\lib\*.a FFmpegUniversal\FFmpeg\Lib\%1\
copy /y Output\FFmpeg\Shared\%1\lib\*.def FFmpegUniversal\FFmpeg\Lib\%1\FFmpegUniversal.def

Expand Down
5 changes: 5 additions & 0 deletions FFmpegUniversal.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documents", "Documents", "{
README.md = README.md
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FFmpegUniversalSDK", "FFmpegUniversalSDK\FFmpegUniversalSDK.vcxitems", "{B4F7B4B6-D656-4FB5-A988-C62B38A3540C}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
FFmpegUniversalSDK\FFmpegUniversalSDK.vcxitems*{b4f7b4b6-d656-4fb5-a988-c62b38a3540c}*SharedItemsImports = 9
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|ARM = Release|ARM
Release|x64 = Release|x64
Expand Down
115 changes: 3 additions & 112 deletions FFmpegUniversal/FFmpegUniversal.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,19 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<OutDir>$(SolutionDir)Output\$(MSBuildProjectName)\$(Platform)\</OutDir>
<OutDir>$(SolutionDir)FFmpegUniversalSDK\$(Platform)\</OutDir>
<IntDir>$(SolutionDir)Output\$(MSBuildProjectName)_Temp\$(Platform)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<OutDir>$(SolutionDir)Output\$(MSBuildProjectName)\$(Platform)\</OutDir>
<OutDir>$(SolutionDir)FFmpegUniversalSDK\$(Platform)\</OutDir>
<IntDir>$(SolutionDir)Output\$(MSBuildProjectName)_Temp\$(Platform)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<GenerateManifest>false</GenerateManifest>
<IgnoreImportLibrary>false</IgnoreImportLibrary>
<OutDir>$(SolutionDir)Output\$(MSBuildProjectName)\$(Platform)\</OutDir>
<OutDir>$(SolutionDir)FFmpegUniversalSDK\$(Platform)\</OutDir>
<IntDir>$(SolutionDir)Output\$(MSBuildProjectName)_Temp\$(Platform)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand Down Expand Up @@ -153,115 +153,6 @@
<PreBuildEvent />
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="FFmpeg\Include\libavcodec\avcodec.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\avdct.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\avfft.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\d3d11va.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\dirac.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\dv_profile.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\dxva2.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\jni.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\mediacodec.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\qsv.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\vaapi.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\vda.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\vdpau.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\version.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\videotoolbox.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\vorbis_parser.h" />
<ClInclude Include="FFmpeg\Include\libavcodec\xvmc.h" />
<ClInclude Include="FFmpeg\Include\libavdevice\avdevice.h" />
<ClInclude Include="FFmpeg\Include\libavdevice\version.h" />
<ClInclude Include="FFmpeg\Include\libavfilter\avfilter.h" />
<ClInclude Include="FFmpeg\Include\libavfilter\avfiltergraph.h" />
<ClInclude Include="FFmpeg\Include\libavfilter\buffersink.h" />
<ClInclude Include="FFmpeg\Include\libavfilter\buffersrc.h" />
<ClInclude Include="FFmpeg\Include\libavfilter\version.h" />
<ClInclude Include="FFmpeg\Include\libavformat\avformat.h" />
<ClInclude Include="FFmpeg\Include\libavformat\avio.h" />
<ClInclude Include="FFmpeg\Include\libavformat\version.h" />
<ClInclude Include="FFmpeg\Include\libavutil\adler32.h" />
<ClInclude Include="FFmpeg\Include\libavutil\aes.h" />
<ClInclude Include="FFmpeg\Include\libavutil\aes_ctr.h" />
<ClInclude Include="FFmpeg\Include\libavutil\attributes.h" />
<ClInclude Include="FFmpeg\Include\libavutil\audio_fifo.h" />
<ClInclude Include="FFmpeg\Include\libavutil\avassert.h" />
<ClInclude Include="FFmpeg\Include\libavutil\avconfig.h" />
<ClInclude Include="FFmpeg\Include\libavutil\avstring.h" />
<ClInclude Include="FFmpeg\Include\libavutil\avutil.h" />
<ClInclude Include="FFmpeg\Include\libavutil\base64.h" />
<ClInclude Include="FFmpeg\Include\libavutil\blowfish.h" />
<ClInclude Include="FFmpeg\Include\libavutil\bprint.h" />
<ClInclude Include="FFmpeg\Include\libavutil\bswap.h" />
<ClInclude Include="FFmpeg\Include\libavutil\buffer.h" />
<ClInclude Include="FFmpeg\Include\libavutil\camellia.h" />
<ClInclude Include="FFmpeg\Include\libavutil\cast5.h" />
<ClInclude Include="FFmpeg\Include\libavutil\channel_layout.h" />
<ClInclude Include="FFmpeg\Include\libavutil\common.h" />
<ClInclude Include="FFmpeg\Include\libavutil\cpu.h" />
<ClInclude Include="FFmpeg\Include\libavutil\crc.h" />
<ClInclude Include="FFmpeg\Include\libavutil\des.h" />
<ClInclude Include="FFmpeg\Include\libavutil\dict.h" />
<ClInclude Include="FFmpeg\Include\libavutil\display.h" />
<ClInclude Include="FFmpeg\Include\libavutil\downmix_info.h" />
<ClInclude Include="FFmpeg\Include\libavutil\error.h" />
<ClInclude Include="FFmpeg\Include\libavutil\eval.h" />
<ClInclude Include="FFmpeg\Include\libavutil\ffversion.h" />
<ClInclude Include="FFmpeg\Include\libavutil\fifo.h" />
<ClInclude Include="FFmpeg\Include\libavutil\file.h" />
<ClInclude Include="FFmpeg\Include\libavutil\frame.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hash.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hmac.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hwcontext.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hwcontext_cuda.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hwcontext_d3d11va.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hwcontext_drm.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hwcontext_dxva2.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hwcontext_qsv.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hwcontext_vaapi.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hwcontext_vdpau.h" />
<ClInclude Include="FFmpeg\Include\libavutil\hwcontext_videotoolbox.h" />
<ClInclude Include="FFmpeg\Include\libavutil\imgutils.h" />
<ClInclude Include="FFmpeg\Include\libavutil\intfloat.h" />
<ClInclude Include="FFmpeg\Include\libavutil\intreadwrite.h" />
<ClInclude Include="FFmpeg\Include\libavutil\lfg.h" />
<ClInclude Include="FFmpeg\Include\libavutil\log.h" />
<ClInclude Include="FFmpeg\Include\libavutil\lzo.h" />
<ClInclude Include="FFmpeg\Include\libavutil\macros.h" />
<ClInclude Include="FFmpeg\Include\libavutil\mastering_display_metadata.h" />
<ClInclude Include="FFmpeg\Include\libavutil\mathematics.h" />
<ClInclude Include="FFmpeg\Include\libavutil\md5.h" />
<ClInclude Include="FFmpeg\Include\libavutil\mem.h" />
<ClInclude Include="FFmpeg\Include\libavutil\motion_vector.h" />
<ClInclude Include="FFmpeg\Include\libavutil\murmur3.h" />
<ClInclude Include="FFmpeg\Include\libavutil\opt.h" />
<ClInclude Include="FFmpeg\Include\libavutil\parseutils.h" />
<ClInclude Include="FFmpeg\Include\libavutil\pixdesc.h" />
<ClInclude Include="FFmpeg\Include\libavutil\pixelutils.h" />
<ClInclude Include="FFmpeg\Include\libavutil\pixfmt.h" />
<ClInclude Include="FFmpeg\Include\libavutil\random_seed.h" />
<ClInclude Include="FFmpeg\Include\libavutil\rational.h" />
<ClInclude Include="FFmpeg\Include\libavutil\rc4.h" />
<ClInclude Include="FFmpeg\Include\libavutil\replaygain.h" />
<ClInclude Include="FFmpeg\Include\libavutil\ripemd.h" />
<ClInclude Include="FFmpeg\Include\libavutil\samplefmt.h" />
<ClInclude Include="FFmpeg\Include\libavutil\sha.h" />
<ClInclude Include="FFmpeg\Include\libavutil\sha512.h" />
<ClInclude Include="FFmpeg\Include\libavutil\spherical.h" />
<ClInclude Include="FFmpeg\Include\libavutil\stereo3d.h" />
<ClInclude Include="FFmpeg\Include\libavutil\tea.h" />
<ClInclude Include="FFmpeg\Include\libavutil\threadmessage.h" />
<ClInclude Include="FFmpeg\Include\libavutil\time.h" />
<ClInclude Include="FFmpeg\Include\libavutil\timecode.h" />
<ClInclude Include="FFmpeg\Include\libavutil\timestamp.h" />
<ClInclude Include="FFmpeg\Include\libavutil\tree.h" />
<ClInclude Include="FFmpeg\Include\libavutil\twofish.h" />
<ClInclude Include="FFmpeg\Include\libavutil\version.h" />
<ClInclude Include="FFmpeg\Include\libavutil\xtea.h" />
<ClInclude Include="FFmpeg\Include\libswresample\swresample.h" />
<ClInclude Include="FFmpeg\Include\libswresample\version.h" />
<ClInclude Include="FFmpeg\Include\libswscale\swscale.h" />
<ClInclude Include="FFmpeg\Include\libswscale\version.h" />
<ClInclude Include="Version.h" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading

0 comments on commit a52ce60

Please sign in to comment.