diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:18:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 15:18:57 +0100 |
| commit | 2cf9ab655549cf2f25ba57ee84baa6d38530ec3b (patch) | |
| tree | ae0a70dc008a9dfccd0b313f6888665662c048a0 /libavformat/mpeg.c | |
| parent | 248140f8a2a6a00a668f59607791d24244a8ff50 (diff) | |
| parent | 8a4f26206d7914eaf2903954ce97cb7686933382 (diff) | |
| download | ffmpeg-2cf9ab655549cf2f25ba57ee84baa6d38530ec3b.tar.gz | |
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>
Diffstat (limited to 'libavformat/mpeg.c')
0 files changed, 0 insertions, 0 deletions