diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-26 21:36:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-26 21:37:15 +0200 |
| commit | 7333798c85837f1cf175f39bc4acb5664fa6cacc (patch) | |
| tree | 60036638a0962b3cb966d62da2eda81f93ac3267 /libavcodec/dct-test.c | |
| parent | 307a20cca216356aec30f5bb102c633169cbc0c1 (diff) | |
| parent | 44dc9c6af0377faf2a99889d1f949e32a1102e84 (diff) | |
| download | ffmpeg-7333798c85837f1cf175f39bc4acb5664fa6cacc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopenjpeg: support YUV and deep RGB pixel formats
Fix typo in v410 decoder.
vf_yadif: unset cur_buf on the input link.
vf_overlay: ensure the overlay frame does not get leaked.
vf_overlay: prevent premature freeing of cur_buf
Support urlencoded http authentication credentials
rtmp: Return an error when the client bandwidth is incorrect
rtmp: Return proper error code in handle_server_bw
rtmp: Return proper error code in handle_client_bw
rtmp: Return proper error codes in handle_chunk_size
lavr: x86: add missing vzeroupper in ff_mix_1_to_2_fltp_flt()
vp8: Replace x*155/100 by x*101581>>16.
vp3: don't use calls to inline asm in yasm code.
x86/dsputil: put inline asm under HAVE_INLINE_ASM.
dsputil_mmx: fix incorrect assembly code
rtmp: Factorize the code by adding handle_invoke
rtmp: Factorize the code by adding handle_chunk_size
rtmp: Factorize the code by adding handle_ping
rtmp: Factorize the code by adding handle_client_bw
rtmp: Factorize the code by adding handle_server_bw
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/x86/dsputil_mmx.c
libavfilter/vf_overlay.c
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dct-test.c')
| -rw-r--r-- | libavcodec/dct-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 37097aac58..d4c32aa6b8 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -125,7 +125,7 @@ static const struct algo idct_tab[] = { { "INT", ff_j_rev_dct, MMX_PERM }, { "SIMPLE-C", ff_simple_idct_8, NO_PERM }, -#if HAVE_MMX +#if HAVE_MMX && HAVE_INLINE_ASM #if CONFIG_GPL { "LIBMPEG2-MMX", ff_mmx_idct, MMX_PERM, AV_CPU_FLAG_MMX, 1 }, { "LIBMPEG2-MMX2", ff_mmxext_idct, MMX_PERM, AV_CPU_FLAG_MMX2, 1 }, |