diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 13:59:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 14:09:59 +0100 |
| commit | eb2f499e37ee8c890836f80c3ffba57e971fe514 (patch) | |
| tree | 1feebb950c73a6f710459f998795525e9b9828fb /tests/ffserver-regression.sh | |
| parent | 766f0552012480934b65a1935d272f6c8cf756fe (diff) | |
| parent | 9146e872c643fb8f20f9043f1b93a3cddfad15c6 (diff) | |
| download | ffmpeg-eb2f499e37ee8c890836f80c3ffba57e971fe514.tar.gz | |
Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'
* commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6':
Revert "fate: Use wmv2 IDCT for wmv2 tests"
Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver-regression.sh')
0 files changed, 0 insertions, 0 deletions