diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 00:06:30 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 00:06:30 +0400 |
| commit | 771919e11fcdf6fb518c04d55b83fb3e50c35a58 (patch) | |
| tree | b62c39a60e32e81665830b97c139ac7e14bacd10 /tests/fate/microsoft.mak | |
| parent | 49e87819d09e4c7a7bbbfa19dff12c2d0db29584 (diff) | |
| parent | 6deae8e0530a885b76f149841ed4899cb438ec23 (diff) | |
Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'
* commit '6deae8e0530a885b76f149841ed4899cb438ec23':
FATE: remove the -dct option from some decoding tests.
avconv: use a local variable for InputFile in open_input_file().
Conflicts:
tests/fate/microsoft.mak
tests/fate/real.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/microsoft.mak')
| -rw-r--r-- | tests/fate/microsoft.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 10aeaf6681..6347f200ed 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -1,5 +1,5 @@ FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1 -fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an +fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an FATE_MSVIDEO1 += fate-msvideo1-8bit fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 |