diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 11:32:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 12:03:23 +0100 |
| commit | e1d10017039de37d1311892fcd49bd936777a196 (patch) | |
| tree | 4a8dab3dc675d5e86143722d926d7450c4f3efee | |
| parent | a696b0917d1d1ef5b0dee691786ddb51ee4ab519 (diff) | |
| parent | e8e560f2a20e59789cafef174b382054ad9721ea (diff) | |
| download | ffmpeg-e1d10017039de37d1311892fcd49bd936777a196.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add a bmpparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/image.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/bmpparser | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index 6b173217ec..09be5a4eb0 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -27,6 +27,9 @@ FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX) += $(FATE_BRENDERPIX) FATE_IMAGE += $(FATE_BRENDERPIX-yes) fate-brenderpix: $(FATE_BRENDERPIX-yes) +FATE_IMAGE-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser +fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bmp -pix_fmt rgb24 + FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx diff --git a/tests/ref/fate/bmpparser b/tests/ref/fate/bmpparser new file mode 100644 index 0000000000..3cdd9864af --- /dev/null +++ b/tests/ref/fate/bmpparser @@ -0,0 +1,5 @@ +#tb 0: 1/25 +0, 0, 0, 1, 3600, 0xd3a7c583 +0, 1, 1, 1, 3600, 0x4602bbf9 +0, 2, 2, 1, 3600, 0x3a96b8f8 +0, 3, 3, 1, 3600, 0xb343b17f |