diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-19 14:24:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-19 14:24:20 +0100 |
| commit | e6d81ce22e433e5413003e49b39587d739a04520 (patch) | |
| tree | 9f5cf3e72a7aa2bc13f80da8695fd6d8a6c161cb /libswscale | |
| parent | 4116151a4bf35cffd2b55b028e714bb2c383c86f (diff) | |
| parent | 89923fce7006d0a42859360068c486aeb7e9b582 (diff) | |
| download | ffmpeg-streaming-e6d81ce22e433e5413003e49b39587d739a04520.zip ffmpeg-streaming-e6d81ce22e433e5413003e49b39587d739a04520.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264_intrapred: Fix C function names in comments
x86: SPLATD: port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/x86/output.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index d57af9b..f9add35 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -187,7 +187,7 @@ cglobal yuv2planeX_%1, %3, 8, %2, filter, fltsize, src, dst, w, dither, offset %else ; %1 == 10/9/8 punpcklwd m5, m3, m4 punpckhwd m3, m4 - SPLATD m0, m0 + SPLATD m0 pmaddwd m5, m0 pmaddwd m3, m0 |
