diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 10:58:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 10:58:44 +0100 |
| commit | 14ab6f9a268a5f0039f0eb4b8ed91c3652d4d0a7 (patch) | |
| tree | a8088d2f8701812856553ad5e02586c092018ef6 /tests/fate-run.sh | |
| parent | f063a0b33ddbafaa4a31e747bf4b445de1a8e8a8 (diff) | |
| parent | 96a06dbaf278e8152487e08772946f63bd2a3843 (diff) | |
| download | ffmpeg-streaming-14ab6f9a268a5f0039f0eb4b8ed91c3652d4d0a7.zip ffmpeg-streaming-14ab6f9a268a5f0039f0eb4b8ed91c3652d4d0a7.tar.gz | |
Merge commit '96a06dbaf278e8152487e08772946f63bd2a3843'
* commit '96a06dbaf278e8152487e08772946f63bd2a3843':
FATE: add support for testing hwaccels
Conflicts:
tests/Makefile
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index feac731..fec3c5e 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -23,6 +23,7 @@ cmp_target=${13:-0} size_tolerance=${14:-0} cmp_unit=${15:-2} gen=${16:-no} +hwaccel=${17:-none} outdir="tests/data/fate" outfile="${outdir}/${test}" @@ -91,7 +92,7 @@ probeframes(){ } ffmpeg(){ - dec_opts="-threads $threads -thread_type $thread_type" + dec_opts="-hwaccel $hwaccel -threads $threads -thread_type $thread_type" ffmpeg_args="-nostats -cpuflags $cpuflags" for arg in $@; do [ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}" |
