diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:57:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:57:59 +0200 |
| commit | e91339cde25afff244b1f5cb2fc206f3dc9570d8 (patch) | |
| tree | fc23bde73da66645989c6941f069774a640cb009 /libavcodec/mpegvideo_parser.c | |
| parent | 550defe16eeae2819f19751d9e323713999d9a65 (diff) | |
| parent | 566b7a20fd0cab44d344329538d314454a0bcc2f (diff) | |
Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f'
* commit '566b7a20fd0cab44d344329538d314454a0bcc2f':
x86: float dsp: butterflies_float SSE
Conflicts:
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_parser.c')
0 files changed, 0 insertions, 0 deletions