generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '8a4f26206d7914eaf2903954ce97cb7686933382'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-01-21 15:18:57 +01:00
parent 248140f8a2 8a4f26206d
commit 2cf9ab6555
6 changed files with 38 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ref/fate/srtp
View File

@@ -1,8 +1,12 @@
80e0123412345678123456780102030405
Decrypted content matches input
Decrypted content matches input
Decrypted content matches input
81c90007123456788765432100000000000012340000069ec73069ba000001fd
Decrypted content matches input
Decrypted content matches input
Decrypted content matches input
80e0123412345678123456780102030405
81c90007123456788765432100000000000012340000069ec73069ba000001fd
80e0123412345678123456780102030405
81c90007123456788765432100000000000012340000069ec73069ba000001fd