diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 22:40:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 22:40:53 +0200 |
| commit | 95cf5e83a750fb886eb8c509e0f907eabda96d1a (patch) | |
| tree | 3ee147797375df9e2206d79f7149a9bc94a31c31 | |
| parent | e4e64f2fea0a0a1ba8eb89f0f6fa1930ff1ec389 (diff) | |
| parent | 4dc0fbb13c33b4e5bdb766652f4daf900ccc952f (diff) | |
| download | ffmpeg-95cf5e83a750fb886eb8c509e0f907eabda96d1a.tar.gz | |
Merge commit '4dc0fbb13c33b4e5bdb766652f4daf900ccc952f' into release/2.4
* commit '4dc0fbb13c33b4e5bdb766652f4daf900ccc952f':
x86: cavs: Remove an unneeded scratch buffer
Conflicts:
libavcodec/x86/cavsdsp.c
See: d79f7bf0d63a81ee66026ee92a6946a7303d04bd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/cavsdsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index 6199a33209..c366942b97 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -142,7 +142,7 @@ static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride) DECLARE_ALIGNED(8, int16_t, b2)[64]; for(i=0; i<2; i++){ - cavs_idct8_1d(block+4*i, ff_pw_4.a); + cavs_idct8_1d(block + 4 * i, ff_pw_4.a); __asm__ volatile( "psraw $3, %%mm7 \n\t" @@ -153,7 +153,7 @@ static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride) "psraw $3, %%mm2 \n\t" "psraw $3, %%mm1 \n\t" "psraw $3, %%mm0 \n\t" - "movq %%mm7, (%0) \n\t" + "movq %%mm7, (%0) \n\t" TRANSPOSE4( %%mm0, %%mm2, %%mm4, %%mm6, %%mm7 ) "movq %%mm0, 8(%0) \n\t" "movq %%mm6, 24(%0) \n\t" @@ -166,7 +166,7 @@ static void cavs_idct8_add_mmx(uint8_t *dst, int16_t *block, int stride) "movq %%mm0, 32(%0) \n\t" "movq %%mm3, 48(%0) \n\t" : - : "r"(b2+32*i) + : "r"(b2 + 32 * i) : "memory" ); } |