diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 18:51:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:16:57 +0200 |
| commit | eacf7d650dfe6e97d6100a232fa6a89592b625b5 (patch) | |
| tree | 08ac45fefde0eab9e8084743ee5a808f39f77d69 /tests/fate-run.sh | |
| parent | beeb7551d6ab44bc6a1125e6d537508bff3694fc (diff) | |
| parent | 0c1959b056f6ccaa2eee2c824352ba93c8e36d52 (diff) | |
Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'
* commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52':
lavf: add AVFMT_FLAG_BITEXACT.
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/flacenc.c
libavformat/movenc.c
libavformat/oggenc.c
libavformat/options_table.h
libavformat/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate-run.sh')
| -rwxr-xr-x | tests/fate-run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 74f4525b9e..60cb569faf 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -127,7 +127,7 @@ enc_dec_pcm(){ ffmpeg -flags +bitexact -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} - } -FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact" +FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact -fflags +bitexact" DEC_OPTS="-threads $threads -idct simple $FLAGS" ENC_OPTS="-threads 1 -idct simple -dct fastint" |