[FFmpeg-cvslog] Merge commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 15:07:04 2013 +0100| [248140f8a2a6a00a668f59607791d24244a8ff50] | committer: Michael Niedermayer

Merge commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f'

* commit '3ef6d22e1ba544ab37c73e8fc61382f13aac250f':
  srtp: cosmetics: Use fewer lines for the test vectors
  srtp: Don't require more input data than what actually is needed

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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