Michael Niedermayer 2cf9ab6555 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@gmx.at>

2013-01-21 15:18:57 +01:00

14 KiB

Raw Blame History

View Raw