[SCM] xwax/master: Support both avconf and ffmpeg binaries

[Andreas Cadhalpun]

On 10.06.2015 13:55, alessio at users.alioth.debian.org wrote:
> The following commit has been merged in the master branch:
> commit 1c85985adf57596ccd89b8d2464737956b12f5f2
> Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
> Date:   Wed Jun 10 12:54:39 2015 +0100
> 
>     Support both avconf and ffmpeg binaries
                        ^
[...]
> +@@ -13,6 +13,8 @@
> + FILE="$1"
> + RATE="$2"
> + 
> ++g_fallback_tool="$(which avconf || which ffmpeg)"
                                  ^
[...]
> +0001-use_either_ffmpeg_or_avconv.patch
                                  ^
The last spelling variant should probably be used before as well. ;)

Best regards,
Andreas