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)
commit8d3133f468516548af1ded06787ba481f8ae89d1
tree90f33ac8bd17380df5ffd8070a080719d51642fb
parent7905bd55557323f72c00bf51a6a5cceabd3e81e5
parent50036c30df83b609bc5a95276f1287f8b9b8bdd6
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>
tests/fate/image.mak