[FFmpeg-cvslog] Revert "fate: Force diff into text mode"

Michael Niedermayer git at videolan.org
Sun Sep 29 12:34:13 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 24 20:53:41 2013 +0200| [5c4fc51d9b9fc74c588e498e86cbef44b593a64a] | committer: Michael Niedermayer

Revert "fate: Force diff into text mode"

This should fix AIX and should no longer be needed

This reverts commit b78e75ebc9b03bea8f0c48da266ee6cc0fb8e22d.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c4fc51d9b9fc74c588e498e86cbef44b593a64a
---

 tests/fate-run.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 71eff80..52ddc22 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -225,7 +225,7 @@ fi
 
 if test -e "$ref" || test $cmp = "oneline" ; then
     case $cmp in
-        diff)   diff -u -a -b "$ref" "$outfile"         >$cmpfile ;;
+        diff)   diff -u -b "$ref" "$outfile"            >$cmpfile ;;
         oneoff) oneoff     "$ref" "$outfile"            >$cmpfile ;;
         stddev) stddev     "$ref" "$outfile"            >$cmpfile ;;
         oneline)oneline    "$ref" "$outfile"            >$cmpfile ;;



More information about the ffmpeg-cvslog mailing list