[FFmpeg-cvslog] Merge commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 30 01:44:08 2014 +0100| [8d3133f468516548af1ded06787ba481f8ae89d1] | committer: Michael Niedermayer

Merge commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6'

* commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6':
  fate: Use bitexact conversions in the dpxparser test

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d3133f468516548af1ded06787ba481f8ae89d1
---