diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-26 23:18:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-26 23:18:54 +0200 |
| commit | 094a4968188b0129d674c1369bad45a86cd0d46d (patch) | |
| tree | 372eb9e7a5dc4222b7db34c5e10ae578b536ed9b /tests | |
| parent | 0a1cf6621067c4a85b519c8cad5c345c29017f89 (diff) | |
| parent | 1717ba0cdd587fe3463c1d8560f2c7e13fb21ba3 (diff) | |
| download | ffmpeg-094a4968188b0129d674c1369bad45a86cd0d46d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fifo: add FIFO API test program, and fate test
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
postprocess.c: filter name needs to be double 0 terminated
doxygen: fix wrong comment syntax, //< vs. ///<
doxygen: drop pointless star from pointer variable names
Replace deprecated av_find_stream_info() by avformat_find_stream_info().
xmv: eliminate superfluous zeroing of zero data
configure: fix typo in avconv dependency list
Conflicts:
configure
doc/APIchanges
libavutil/Makefile
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/libavutil.mak | 4 | ||||
| -rw-r--r-- | tests/ref/fate/fifo | 27 |
2 files changed, 31 insertions, 0 deletions
diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index 4299f081ac..a65b724305 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -25,6 +25,10 @@ FATE_TESTS += fate-eval fate-eval: libavutil/eval-test$(EXESUF) fate-eval: CMD = run libavutil/eval-test +FATE_TESTS += fate-fifo +fate-fifo: libavutil/fifo-test$(EXESUF) +fate-fifo: CMD = run libavutil/fifo-test + FATE_TESTS += fate-md5 fate-md5: libavutil/md5-test$(EXESUF) fate-md5: CMD = run libavutil/md5-test diff --git a/tests/ref/fate/fifo b/tests/ref/fate/fifo new file mode 100644 index 0000000000..18a5691fee --- /dev/null +++ b/tests/ref/fate/fifo @@ -0,0 +1,27 @@ +-12: 1 +-11: 2 +-10: 3 +-9: 4 +-8: 5 +-7: 6 +-6: 7 +-5: 8 +-4: 9 +-3: 10 +-2: 11 +-1: 12 +0: 0 +1: 1 +2: 2 +3: 3 +4: 4 +5: 5 +6: 6 +7: 7 +8: 8 +9: 9 +10: 10 +11: 11 +12: 12 + +0 1 2 3 4 5 6 7 8 9 10 11 12 |