[SCM] x264/master: autopkgtest: Use ffmpeg/ffprobe instead of deprecated avconv/avprobe

[onovy at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 46ca12657fbba8f4573a08255fe37e8e8ff9c607
Author: Ondřej Nový <onovy at debian.org>
Date:   Wed Aug 3 21:10:21 2016 +0200

    autopkgtest: Use ffmpeg/ffprobe instead of deprecated avconv/avprobe

diff --git a/debian/tests/control b/debian/tests/control
index b938b96..4e48f18 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: encode-testimage
-Depends: libav-tools (>> 6:10~), x264
+Depends: ffmpeg, x264
 Restrictions: allow-stderr
diff --git a/debian/tests/encode-testimage b/debian/tests/encode-testimage
index 5d7d03b..5f97716 100755
--- a/debian/tests/encode-testimage
+++ b/debian/tests/encode-testimage
@@ -1,5 +1,5 @@
 #!/bin/sh
-# autopkgtest check: Use avprobe to produce a 10s test image,
+# autopkgtest check: Use ffmpeg to produce a 10s test image,
 # and use x264 to encode to H.264 high profile
 
 set -e
@@ -8,7 +8,7 @@ WORKDIR=$(mktemp -d)
 trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
 cd $WORKDIR
 
-avconv -y -filter_complex testsrc -t 10s in.avi
+ffmpeg -y -filter_complex testsrc -t 10 in.avi
 x264 --crf 24 -o out.mkv in.avi
-avprobe -of ini -show_streams out.mkv | tee avprobe.txt
+ffprobe -of ini -show_streams out.mkv | tee avprobe.txt
 grep ^profile=High avprobe.txt

-- 
x264 packaging