diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 18:57:23 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 18:57:28 +0400 |
| commit | b36095ea0f668e2b7aac33643a6a33d03433a418 (patch) | |
| tree | c937aa0852722988728bd5063ee871ea5932b9bf /tests/fate/vcodec.mak | |
| parent | f506ae19ffb5ad1366a889b4dbec16254db4b755 (diff) | |
| parent | 3e2f200237af977b9253b0aff121eee27bcedb44 (diff) | |
Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'
* commit '3e2f200237af977b9253b0aff121eee27bcedb44':
roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
xxan: fix invalid memory access in xan_decode_frame_type0()
tty: set avg_frame_rate.
FATE: enable multiple slices in the ffv1 vsynth test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vcodec.mak')
| -rw-r--r-- | tests/fate/vcodec.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index f10e80c3e7..b1310a5c86 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -55,7 +55,7 @@ fate-vsynth%-dv-50: DECOPTS = -sws_flags neighbor fate-vsynth%-dv-50: FMT = dv FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 -fate-vsynth%-ffv1: ENCOPTS = -strict -2 +fate-vsynth%-ffv1: ENCOPTS = -slices 4 -strict -2 FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff |