Merge branch 'crypto' of https://github.com/jamrial/FFmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Jun 2013 23:07:13 +0000 (01:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Jun 2013 23:07:24 +0000 (01:07 +0200)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge