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/h264pred.c | |
| parent | ac627b3d38d370027406c93c2dcaac0b1712a7d4 (diff) | |
| parent | 7e522859fc463a14875f78957bb57d2f33607d19 (diff) | |
| download | ffmpeg-streaming-52dc18d414f4aa2c5a210edfb82cc1a99942ca3b.zip ffmpeg-streaming-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/h264pred.c')
| -rw-r--r-- | libavcodec/h264pred.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 2d8b9a4..5619efd 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -549,5 +549,5 @@ void ff_h264_pred_init(H264PredContext *h, int codec_id, const int bit_depth, co } if (ARCH_ARM) ff_h264_pred_init_arm(h, codec_id, bit_depth, chroma_format_idc); - if (HAVE_MMX) ff_h264_pred_init_x86(h, codec_id, bit_depth, chroma_format_idc); + if (ARCH_X86) ff_h264_pred_init_x86(h, codec_id, bit_depth, chroma_format_idc); } |
