generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '4dc0fbb13c33b4e5bdb766652f4daf900ccc952f' into release/2.4

Browse Source 
* commit '4dc0fbb13c33b4e5bdb766652f4daf900ccc952f':
  x86: cavs: Remove an unneeded scratch buffer

Conflicts:
	libavcodec/x86/cavsdsp.c

See: d79f7bf0d6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-28 22:40:35 +02:00
parent e4e64f2fea 4dc0fbb13c
commit 95cf5e83a7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/x86/cavsdsp.c
View File

@@ -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]; DECLARE_ALIGNED(8, int16_t, b2)[64];
for(i=0; i<2; i++){ 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( __asm__ volatile(
"psraw $3, %%mm7 \n\t" "psraw $3, %%mm7 \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 %%mm0, 32(%0) \n\t"
"movq %%mm3, 48(%0) \n\t" "movq %%mm3, 48(%0) \n\t"
: :
: "r"(b2+32*i) : "r"(b2 + 32 * i)
: "memory" : "memory"
); );
} }