summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-21 16:34:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-21 17:29:58 +0100
commita0f8e6ad67b0eeb32778db532d40f545c4f38191 (patch)
treec4bbaf47dae14280957d69f48dc47e4ea098d70e /tests
parent6e638677712837eb436c71c650f45313553b47ea (diff)
downloadffmpeg-a0f8e6ad67b0eeb32778db532d40f545c4f38191.tar.gz
tests/tiny_ssim: drop isatty() support
tiny_ssim is build on the host, not the target and the HAVE_* are set for the target. This patch fixes building tiny_ssim when HAVE_* differed between target and host Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r--tests/tiny_ssim.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/tests/tiny_ssim.c b/tests/tiny_ssim.c
index f30530c5ec..fe65e47533 100644
--- a/tests/tiny_ssim.c
+++ b/tests/tiny_ssim.c
@@ -32,14 +32,6 @@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-#if HAVE_ISATTY
-#if HAVE_IO_H
-#include <io.h>
-#endif
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#endif
#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
@@ -192,7 +184,7 @@ int main(int argc, char* argv[])
double ssim[3] = {0,0,0};
int frame_size, w, h;
int frames, seek;
- int i, istty = 1;
+ int i;
if( argc<4 || 2 != sscanf(argv[3], "%dx%d", &w, &h) )
{
@@ -215,9 +207,6 @@ int main(int argc, char* argv[])
seek = argc<5 ? 0 : atoi(argv[4]);
fseek(f[seek<0], seek < 0 ? -seek : seek, SEEK_SET);
-#if HAVE_ISATTY
- istty = isatty(0) && isatty(2);
-#endif
for( frames=0;; frames++ )
{
uint64_t ssd_one[3];
@@ -236,11 +225,8 @@ int main(int argc, char* argv[])
printf("Frame %d | ", frames);
print_results(ssd_one, ssim_one, 1, w, h);
- if (istty) {
- printf(" \r");
- fflush(stdout);
- } else
- printf("\n");
+ printf(" \r");
+ fflush(stdout);
}
if( !frames ) return 0;