[SCM] xwax/master: Fix typo in 'which avconv'

[dhj-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8e43d9a20c5f1cdde7302884840eb708d2da05d2
Author: Daniel James <daniel at 64studio.com>
Date:   Mon Aug 8 16:56:54 2016 +0100

    Fix typo in 'which avconv'

diff --git a/debian/patches/0001-use_either_ffmpeg_or_avconv.patch b/debian/patches/0001-use_either_ffmpeg_or_avconv.patch
index ed4c198..2ed6ea2 100644
--- a/debian/patches/0001-use_either_ffmpeg_or_avconv.patch
+++ b/debian/patches/0001-use_either_ffmpeg_or_avconv.patch
@@ -1,4 +1,4 @@
-Description: Pick either avconv of ffmpeg.
+Description: Pick either avconv or ffmpeg.
 Author: Alessio Treglia <alessio at debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722487
 Forwarded: no
@@ -12,7 +12,7 @@ Forwarded: no
  FILE="$1"
  RATE="$2"
  
-+g_fallback_tool="$(which avconf || which ffmpeg)"
++g_fallback_tool="$(which avconv || which ffmpeg)"
 +
  case "$FILE" in
  

-- 
xwax packaging