diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 13:54:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 13:54:34 +0100 |
| commit | b1b870fbd7185bffbe27c5918001b40a8ff8b920 (patch) | |
| tree | bcbe435fd95a2b06c8526617a2959fe0f6b8c637 /libavcodec/xfacedec.c | |
| parent | 205b2d2a9822e163cb24a2531d4b50e82e64eae4 (diff) | |
| parent | 55aa03b9f8f11ebb7535424cc0e5635558590f49 (diff) | |
| download | ffmpeg-b1b870fbd7185bffbe27c5918001b40a8ff8b920.tar.gz | |
Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
floatdsp: move vector_fmul_add from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xfacedec.c')
0 files changed, 0 insertions, 0 deletions