diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-08 02:36:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-08 02:36:23 +0100 |
commit | 7c148f30f364ca721f12960cfa2bfe3d670a0207 (patch) | |
tree | 76591196342fe72eb97be7411791e65ebf8aa211 /libavformat/allformats.c | |
parent | 2048126ea7a5df2aec55a0db24f642a05e80dca4 (diff) | |
parent | 2efaaf9476c87cdbd174b95c0519575c7d6f30cf (diff) | |
download | ffmpeg-7c148f30f364ca721f12960cfa2bfe3d670a0207.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Support decoding yuv dpx images.
Do not use -mdynamic-no-pic on OSX x86_64.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/allformats.c')
0 files changed, 0 insertions, 0 deletions