videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b' 

* commit '746ad4e0df7faf93329804e412ec53c1d929a75b':
  dct-test: Improve CPU flags struct member name

Conflicts:
	libavcodec/dct-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-18 21:36:46 +02:00
parent 2dbda9378c 746ad4e0df
commit 29119aff6c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dct-test.c
View File

@ -62,7 +62,7 @@ struct algo {
void (*func)(int16_t *block);
enum formattag { NO_PERM, MMX_PERM, MMX_SIMPLE_PERM, SCALE_PERM,
SSE2_PERM, PARTTRANS_PERM, TRANSPOSE_PERM } format;
int mm_support;
int cpu_flag;
int nonspec;
};
@ -572,7 +572,7 @@ int main(int argc, char **argv)
const int cpu_flags = av_get_cpu_flags();
const struct algo *algos = test_idct ? idct_tab : fdct_tab;
for (i = 0; algos[i].name; i++)
if (!(~cpu_flags & algos[i].mm_support)) {
if (!(~cpu_flags & algos[i].cpu_flag)) {
err |= dct_error(&algos[i], test, test_idct, speed, bits);
}
}