Merge branch 'master' into dev

tjbenchtest.java.in

@@ -33,8 +33,6 @@ if [ -d $OUTDIR ]; then
 fi
 mkdir -p $OUTDIR
 
-exec >$EXEDIR/tjbenchtest-java.log
-
 if [ $# -gt 0 ]; then
 	if [ "$1" = "-yuv" ]; then
 		NSARG=-nosmooth
@@ -60,6 +58,8 @@ if [ $# -gt 0 ]; then
 	fi
 fi
 
+exec >$EXEDIR/tjbenchtest-java$YUVARG.log
+
 # Standard tests
 for image in $IMAGES; do