diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 21:45:02 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 21:45:02 +0100 |
commit | 58b8d268d97109b3df0fd77feb7acde3f139c4e1 (patch) | |
tree | 4b7cd8280bc59d7348a60f499ebb7cc9a88ecf60 /libavcodec/arm | |
parent | 990f956ce66b39c997b98cdef9d031201b5a254a (diff) | |
parent | aa807425395caa17a85ed2833133278e8bd44a76 (diff) | |
download | ffmpeg-58b8d268d97109b3df0fd77feb7acde3f139c4e1.tar.gz |
Merge commit 'aa807425395caa17a85ed2833133278e8bd44a76'
* commit 'aa807425395caa17a85ed2833133278e8bd44a76':
configure: Support older version of openjpeg1
Conflicts:
configure
Not merged as the problematic pkg config code wasnt merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
0 files changed, 0 insertions, 0 deletions