From a38a4f44b5c719f21e06da8d4f7d7aa9f4e190a6 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 6 Feb 2016 12:07:47 +0100 Subject: [PATCH 1/3] configure: Support MSYS2 mingw-w64 64bit --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 8af0dccf24..d16ee682e3 100755 --- a/configure +++ b/configure @@ -2834,7 +2834,7 @@ fi exesuf() { case $1 in - mingw32*|win32|win64|cygwin*|*-dos|freedos|opendos|os/2*|symbian) echo .exe ;; + mingw32*|mingw64*|win32|win64|cygwin*|*-dos|freedos|opendos|os/2*|symbian) echo .exe ;; esac } @@ -3750,7 +3750,7 @@ case $target_os in msys*) die "Native MSYS builds are discouraged, please use the MINGW environment."; ;; - mingw32*) + mingw32*|mingw64*) if test $target_os = "mingw32ce"; then disable network else From f428893c172536fbc108b24790d7ecef301c77b7 Mon Sep 17 00:00:00 2001 From: Vicente Jimenez Aguilar Date: Thu, 21 Feb 2013 15:08:55 +0100 Subject: [PATCH 2/3] doc: Improve the channelsplit example Expand LFE acronym (lfe.wav -> low_frecuency_effects.wav) as with others filenames Signed-off-by: Luca Barbato --- doc/filters.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 9804c0e29d..d5aa99be8e 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -498,9 +498,9 @@ Split a 5.1 WAV file into per-channel files: @example avconv -i in.wav -filter_complex 'channelsplit=channel_layout=5.1[FL][FR][FC][LFE][SL][SR]' --map '[FL]' front_left.wav -map '[FR]' front_right.wav -map '[FC]' -front_center.wav -map '[LFE]' lfe.wav -map '[SL]' side_left.wav -map '[SR]' -side_right.wav +-map '[FL]' front_left.wav -map '[FR]' front_right.wav +-map '[FC]' front_center.wav -map '[LFE]' low_frequency_effects.wav +-map '[SL]' side_left.wav -map '[SR]' side_right.wav @end example @section channelmap From 389b79842c67b1f5730215a752a5f89cb1b8d9a3 Mon Sep 17 00:00:00 2001 From: Henrik Gramner Date: Thu, 28 Jan 2016 17:11:21 +0100 Subject: [PATCH 3/3] msvc: Fix libx264 linking Signed-off-by: Luca Barbato --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index d16ee682e3..661dd3d422 100755 --- a/configure +++ b/configure @@ -2951,6 +2951,7 @@ msvc_common_flags(){ -lz) echo zlib.lib ;; -lavifil32) echo vfw32.lib ;; -lavicap32) echo vfw32.lib user32.lib ;; + -lx264) echo libx264.lib ;; -l*) echo ${flag#-l}.lib ;; -L*) echo -libpath:${flag#-L} ;; *) echo $flag ;;