[FFmpeg-cvslog] Merge commit 'aa807425395caa17a85ed2833133278e8bd44a76'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 21:45:02 2014 +0100| [58b8d268d97109b3df0fd77feb7acde3f139c4e1] | committer: Michael Niedermayer

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 at gmx.at>

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