[SCM] ffmpeg/master: Fix log messages in autopkgtest.

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

The following commit has been merged in the master branch:
commit b4c1be78174afd9bb464b20df87ca69b3bb10038
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Dec 6 23:55:26 2016 +0100

    Fix log messages in autopkgtest.

diff --git a/debian/tests/encdec b/debian/tests/encdec
index 4c93144..c480742 100755
--- a/debian/tests/encdec
+++ b/debian/tests/encdec
@@ -313,7 +313,7 @@ for test in $tests; do
         else
             failures="${failures}${errmsg}\n"
         fi
-        echo -e "FAILED: $errmsg\n\n"
+        echo -e "\nFAILED: $errmsg\n\n"
         continue
     fi
     ret=0
@@ -326,7 +326,7 @@ for test in $tests; do
         else
             failures="${failures}${errmsg}\n"
         fi
-        echo -e "FAILED: $errmsg\n\n"
+        echo -e "\nFAILED: $errmsg\n\n"
         continue
     fi
     ret=0
@@ -339,9 +339,10 @@ for test in $tests; do
         else
             failures="${failures}${errmsg}\n"
         fi
-        echo -e "FAILED: $errmsg\n\n"
+        echo -e "\nFAILED: $errmsg\n\n"
         continue
     fi
+    streamcopy_orig="$streamcopy"
     if [ "$streamcopy" == "1" ]; then
         ret=0
         # test streamcopying the file
@@ -355,7 +356,7 @@ for test in $tests; do
             else
                 failures="${failures}${errmsg}\n"
             fi
-            echo -e "FAILED: $errmsg\n\n"
+            echo -e "\nFAILED: $errmsg\n\n"
             streamcopy=0
         fi
     fi
@@ -370,13 +371,15 @@ for test in $tests; do
             else
                 failures="${failures}${errmsg}\n"
             fi
-            echo -e "FAILED: $errmsg\n\n"
+            echo -e "\nFAILED: $errmsg\n\n"
             streamcopy=0
         fi
     fi
     works=$([ "$streamcopy" = "1" ] && echo works || echo fails)
-    echo -e "\nSUCCESS: correctly created file with format '$mux' and codec '$tenc'; streamcopying $works\n\n"
-    num_success=$((num_success + 1))
+    if [ "$streamcopy_orig" = "$streamcopy" ]; then
+        echo -e "\nSUCCESS: correctly created file with format '$mux' and codec '$tenc'; streamcopying $works\n\n"
+        num_success=$((num_success + 1))
+    fi
     if [ "$update" ]; then
         if [ "x$last_mux" != "x$mux" ]; then
             if [ "$last_mux" ]; then

-- 
ffmpeg packaging