diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-05 22:10:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-05 22:29:16 +0200 |
| commit | 3c54e7ed4f42d8ed5aece9484190b5294e272c36 (patch) | |
| tree | 65e03151a2e17d9ac11aa76cc53b388a3185e3d6 /tests/fate-run.sh | |
| parent | 27bf599350a869877a1c9304abf9c95991692dd2 (diff) | |
| parent | ae264bb29be3506a489347c6e27a04cded0de621 (diff) | |
| download | ffmpeg-3c54e7ed4f42d8ed5aece9484190b5294e272c36.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling()
ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
wavpack: fix wrong return value in wavpack_decode_block()
avconv: fix parsing metadata specifiers.
fate: use +frame+slice named constants instead of '3'
mpeg12: propagate more real return values through chunk decode error return and fix some indentation
wavpack: use context reset in appropriate places
avconv: move mux_preload and mux_max_delay to options context
avconv: move bitstream filters to options context.
avconv: move rate_emu to options context.
avconv: move max_frames to options context.
avconv: move metadata to options context.
avconv: move ts scale to options context.
avconv: move chapter maps to options context.
avconv: move metadata maps to options context.
avconv: move codec_names to options context.
Conflicts:
avconv.c
tests/fate-run.sh
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 3de097e515..a09c13ab47 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -16,7 +16,7 @@ cmp=${6:-diff} ref=${7:-"${base}/ref/fate/${test}"} fuzz=$8 threads=${9:-1} -thread_type=${10:-3} +thread_type=${10:-frame+slice} tool=${11} outdir="tests/data/fate" |