* commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6': fate: Use bitexact conversions in the dpxparser test Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6': fate: Use bitexact conversions in the dpxparser test Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>