diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 19:32:06 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 19:32:06 +0200 |
commit | a1fc1d2e1b4a5bcfd07549dce9735f24237aa32e (patch) | |
tree | 924f2f1428ad37e7265a8effffd0158bb2a4ef48 /tests | |
parent | 39f0a45a1a087e5bbef84fa3366942384ec32155 (diff) | |
parent | d041dec3cba300aef6e489990be7242dcd808441 (diff) | |
download | ffmpeg-a1fc1d2e1b4a5bcfd07549dce9735f24237aa32e.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcm-mpeg: improve log message wording
fate: add missing $(TARGET_PATH) to ac3-fixed-encode
fate: fix md5sum replacement on some systems
avprobe: correctly set the default formatter
lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs
lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs
lavr: add C functions for mixing 2 to 1 channels with s16p format
avprobe: move formatter functions in the context
Conflicts:
ffprobe.c
libavcodec/pcm-mpeg.c
tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fate/ac3.mak | 2 | ||||
-rw-r--r-- | tests/md5.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index 3b79324e77..015a6f6f95 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -48,7 +48,7 @@ fate-eac3-encode: FUZZ = 3 FATE_AC3 += fate-ac3-fixed-encode fate-ac3-fixed-encode: tests/data/asynth-44100-2.wav -fate-ac3-fixed-encode: SRC = tests/data/asynth-44100-2.wav +fate-ac3-fixed-encode: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -ab 128k -f ac3 -flags +bitexact fate-ac3-fixed-encode: CMP = oneline fate-ac3-fixed-encode: REF = a1d1fc116463b771abf5aef7ed37d7b1 diff --git a/tests/md5.sh b/tests/md5.sh index 16b0281c00..4b95127701 100644 --- a/tests/md5.sh +++ b/tests/md5.sh @@ -2,8 +2,8 @@ if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then do_md5sum() { md5sum -b $1; } -elif [ X"$(echo | md5 2> /dev/null)" != X ]; then - do_md5sum() { md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; } +elif [ X"$(echo | command md5 2> /dev/null)" != X ]; then + do_md5sum() { command md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; } elif [ -x /sbin/md5 ]; then do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; } elif openssl version >/dev/null 2>&1; then |