[FFmpeg-cvslog] Merge commit 'b920c1d' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 02:58:37 2014 +0100| [eac281b06c453c0af0ffc2a8fb72f976abe583cb] | committer: Michael Niedermayer

Merge commit 'b920c1d' into release/2.2

* commit 'b920c1d':
  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=eac281b06c453c0af0ffc2a8fb72f976abe583cb
---