diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 11:33:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 11:35:07 +0200 |
| commit | 9276467bcec5deaa5a3cfa3a064d8f85fcb4099c (patch) | |
| tree | 77b647c665357fe227a8164a0d579965508b9e90 | |
| parent | fe5b0895966382402e8fb17f63dfe8117c8915ec (diff) | |
| parent | 851465f9d9edaa1c233ed72f2a510119d0151928 (diff) | |
| download | ffmpeg-9276467bcec5deaa5a3cfa3a064d8f85fcb4099c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate-jpeg2000-dcinema: force output to xyz12le
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/video.mak | 2 | ||||
| -rw-r--r-- | tests/ref/fate/jpeg2000-dcinema | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 0dea313c84..7e3c97b410 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -157,7 +157,7 @@ FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema -fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt rgb48le +fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv fate-jv: CMD = framecrc -i $(SAMPLES)/jv/intro.jv -pix_fmt rgb24 -an diff --git a/tests/ref/fate/jpeg2000-dcinema b/tests/ref/fate/jpeg2000-dcinema index d0ef9178f7..940759aeb4 100644 --- a/tests/ref/fate/jpeg2000-dcinema +++ b/tests/ref/fate/jpeg2000-dcinema @@ -1,3 +1,3 @@ #tb 0: 1/24 -0, 0, 0, 1, 12441600, 0x380d805a -0, 1, 1, 1, 12441600, 0xfde5a60a +0, 0, 0, 1, 12441600, 0xf0de508b +0, 1, 1, 1, 12441600, 0x8e50c249 |