diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:21:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:33:27 +0100 |
| commit | 7711f19eda40a7fd1c8a327f1700ffdd115e1667 (patch) | |
| tree | a5e84b671607fe633568f86d2f5cf8c2dea698db /tests/ref/vsynth/vsynth2-mjpeg | |
| parent | 211372e86dbf73505bd981dec7ad755e0623d22d (diff) | |
| parent | e816034a5fa131b13c4ad87bb0b5065b4f5697c6 (diff) | |
| download | ffmpeg-7711f19eda40a7fd1c8a327f1700ffdd115e1667.tar.gz | |
Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'
* commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6':
fate-seek: remove use of gnu make 3.82 only private modifier
fate: move vsynth reference files to their own directory
fate: move fate-acodec reference files to their own dir
configure: avplay now depends on avresample
fate: split dependencies for fate-seek tests
Conflicts:
configure
tests/fate/seek.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/vsynth/vsynth2-mjpeg')
| -rw-r--r-- | tests/ref/vsynth/vsynth2-mjpeg | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/ref/vsynth/vsynth2-mjpeg b/tests/ref/vsynth/vsynth2-mjpeg new file mode 100644 index 0000000000..f1780c5257 --- /dev/null +++ b/tests/ref/vsynth/vsynth2-mjpeg @@ -0,0 +1,4 @@ +302197cccebb4d9797a08d06ca189533 *tests/data/fate/vsynth2-mjpeg.avi +673174 tests/data/fate/vsynth2-mjpeg.avi +9d4bd90e9abfa18192383b4adc23c8d4 *tests/data/fate/vsynth2-mjpeg.out.rawvideo +stddev: 4.32 PSNR: 35.40 MAXDIFF: 49 bytes: 7603200/ 7603200 |