virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

Browse Source 
* commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b':
  tiny_psnr: check for specified sample size less than 1
  fate: improve md5sum utility selection
  rangecoder-test: Drop timer output that clutters stderr

Conflicts:
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-16 14:04:14 +02:00
commit 83962004f7
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/rangecoder.c
View File

@ -137,11 +137,8 @@ int main(void)
for (i = 0; i < SIZE; i++)
r[i] = av_lfg_get(&prng) % 7;
for (i = 0; i < SIZE; i++) {
START_TIMER
for (i = 0; i < SIZE; i++)
put_rac(&c, state, r[i] & 1);
STOP_TIMER("put_rac")
}
ff_rac_terminate(&c);
@ -149,14 +146,11 @@ STOP_TIMER("put_rac")
memset(state, 128, sizeof(state));
for (i = 0; i < SIZE; i++) {
START_TIMER
for (i = 0; i < SIZE; i++)
if ((r[i] & 1) != get_rac(&c, state)) {
av_log(NULL, AV_LOG_ERROR, "rac failure at %d\n", i);
return 1;
}
STOP_TIMER("get_rac")
}
return 0;
}

2
tests/md5.sh
View File

@ -1,6 +1,6 @@
# try to find an md5 program
if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then
if [ X"$(echo | md5sum -b 2> /dev/null)" != X ]; then
do_md5sum() { md5sum -b $1; }
elif [ X"$(echo | command md5 2> /dev/null)" != X ]; then
do_md5sum() { command md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; }

2
tests/tiny_psnr.c
View File

@ -231,7 +231,7 @@ int main(int argc, char *argv[])
} else {
char *end;
len = strtol(argv[3], &end, 0);
if (*end || len > 2) {
if (*end || len < 1 || len > 2) {
fprintf(stderr, "Unsupported sample format: %s\n", argv[3]);
return 1;
}