Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Feb 2015 01:36:19 +0000 (02:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Feb 2015 01:36:23 +0000 (02:36 +0100)
* cehoyos/master:
  Support decoding yuv dpx images.
  Do not use -mdynamic-no-pic on OSX x86_64.

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

Trivial merge