Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'
[ffmpeg.git] / libavformat / srtp.h
2013-01-15 Michael NiedermayerMerge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'
2013-01-15 Martin Storsjölavf: Add functions for SRTP decryption/encryption