project: fixes for native windows ffmpeg build

Change-Id: I671079c6cc81203f473dc18cc0e5e06d5691e1d2

contrib/src/ffmpeg/fetch_and_patch.bat

@@ -17,6 +17,6 @@ del %FFMPEG_VERSION%.tar && del %FFMPEG_VERSION%.tar.gz && del pax_global_header
 rename FFmpeg-%FFMPEG_VERSION% ffmpeg
 
 cd ffmpeg
-git apply --reject --whitespace=fix %SRC%\ffmpeg\windows-no-pkg-config.patch
+git apply --reject --whitespace=fix %SRC%\ffmpeg\windows-configure.patch
 
 cd %SRC%
\ No newline at end of file

contrib/src/ffmpeg/windows-no-pkg-config.patch → contrib/src/ffmpeg/windows-configure.patch

@@ -9,6 +9,24 @@
  }
  
  hostcc_e(){
+@@ -6735,17 +6735,6 @@ flatten_extralibs_wrapper(){
+     eval printf \''%s'\' \""\$$list_name"\"
+ }
+ 
+-for linkunit in $LIBRARY_LIST; do
+-    unset current_extralibs
+-    eval components=\$$(toupper ${linkunit})_COMPONENTS_LIST
+-    for comp in ${components}; do
+-        enabled $comp || continue
+-        comp_extralibs="${comp}_extralibs"
+-        append current_extralibs $comp_extralibs
+-    done
+-    eval prepend ${linkunit}_extralibs $current_extralibs
+-done
+-
+ for linkunit in $LIBRARY_LIST $PROGRAM_LIST $EXTRALIBS_LIST; do
+     eval ${linkunit}_extralibs=\$\(flatten_extralibs_wrapper ${linkunit}_extralibs\)
+ done
 -- 
 2.10.2.windows.1
 

contrib/src/ffmpeg/windows-uwp-x64-configure-make.sh

@@ -11,6 +11,8 @@ cd Output/Windows10/x64
 --disable-programs \
 --disable-d3d11va \
 --disable-dxva2 \
+--disable-debug \
+--disable-postproc \
 --arch=x86_64 \
 --enable-shared \
 --enable-cross-compile \
@@ -23,8 +25,7 @@ cd Output/Windows10/x64
 --enable-parser=h264 \
 --enable-libx264 \
 --extra-cflags="-MD -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_WIN32_WINNT=0x0A00 -I../../../../../msvc/include -I../../../../../msvc/include/opus" \
---extra-ldflags="-APPCONTAINER WindowsApp.lib libopus.lib -LIBPATH:../../../../../msvc/lib/x64" \
+--extra-ldflags="-APPCONTAINER WindowsApp.lib libopus.lib libx264.lib -LIBPATH:../../../../../msvc/lib/x64" \
 --prefix=../../../Build/Windows10/x64
-make -j8
-make install
+make -j8 install
 cd ../../..
\ No newline at end of file