diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 21:36:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-08 21:46:34 +0200 |
| commit | 52dc18d414f4aa2c5a210edfb82cc1a99942ca3b (patch) | |
| tree | c2aedd51f56ee49222c76f44b238c16102132db1 /libavcodec/fmtconvert.c | |
| parent | ac627b3d38d370027406c93c2dcaac0b1712a7d4 (diff) | |
| parent | 7e522859fc463a14875f78957bb57d2f33607d19 (diff) | |
| download | ffmpeg-52dc18d414f4aa2c5a210edfb82cc1a99942ca3b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)
x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86)
x86: call most of the x86 dsp init functions under if (ARCH_X86)
doc: support the new website layout
doc: remove a warning from filters.texi
doc: initial nut documentation
segment: drop global headers setting
lavu: fix typo in Makefile
Conflicts:
doc/Makefile
doc/filters.texi
doc/t2h.init
libavcodec/fmtconvert.c
libavcodec/proresdsp.c
libavcodec/x86/Makefile
libavcodec/x86/vc1dsp_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fmtconvert.c')
| -rw-r--r-- | libavcodec/fmtconvert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index 372f2a36ce..79e9645837 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -85,7 +85,7 @@ av_cold void ff_fmt_convert_init(FmtConvertContext *c, AVCodecContext *avctx) if (ARCH_ARM) ff_fmt_convert_init_arm(c, avctx); if (HAVE_ALTIVEC) ff_fmt_convert_init_altivec(c, avctx); - if (HAVE_MMX) ff_fmt_convert_init_x86(c, avctx); + if (ARCH_X86) ff_fmt_convert_init_x86(c, avctx); if (HAVE_MIPSFPU) ff_fmt_convert_init_mips(c); } |