Merge commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Dec 2014 00:44:08 +0000 (01:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Dec 2014 00:44:08 +0000 (01:44 +0100)
* commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6':
  fate: Use bitexact conversions in the dpxparser test

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tests/fate/image.mak

@@@ -34,7 -34,7 +34,7 @@@ FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) 
  fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
  
  FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX) += fate-dpxparser
- fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/lena_4x_concat.dpx
 -fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/libav_4x_concat.dpx -sws_flags +accurate_rnd+bitexact
++fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/lena_4x_concat.dpx -sws_flags +accurate_rnd+bitexact
  
  FATE_EXR += fate-exr-slice-raw
  fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -pix_fmt rgba64le