1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00

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>
This commit is contained in:
Michael Niedermayer 2014-03-12 21:45:02 +01:00
commit 58b8d268d9

Diff Content Not Available