diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-30 01:44:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-30 01:44:08 +0100 |
| commit | 8d3133f468516548af1ded06787ba481f8ae89d1 (patch) | |
| tree | 90f33ac8bd17380df5ffd8070a080719d51642fb | |
| parent | 7905bd55557323f72c00bf51a6a5cceabd3e81e5 (diff) | |
| parent | 50036c30df83b609bc5a95276f1287f8b9b8bdd6 (diff) | |
| download | ffmpeg-8d3133f468516548af1ded06787ba481f8ae89d1.tar.gz | |
Merge commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6'
* commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6':
fate: Use bitexact conversions in the dpxparser test
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/image.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/image.mak b/tests/fate/image.mak index fb617cd7a3..e17f068523 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -34,7 +34,7 @@ FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-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/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 |