[FFmpeg-cvslog] Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 15:18:57 2013 +0100| [2cf9ab655549cf2f25ba57ee84baa6d38530ec3b] | committer: Michael Niedermayer

Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'

* commit '8a4f26206d7914eaf2903954ce97cb7686933382':
  dsputil: remove butterflies_float_interleave.
  srtp: Move a variable to a local scope
  srtp: Add tests for the crypto suite with 32/80 bit HMAC

Conflicts:
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_mmx.c

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

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