Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Oct 2012 19:36:14 +0000 (21:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Oct 2012 19:46:34 +0000 (21:46 +0200)
commit52dc18d414f4aa2c5a210edfb82cc1a99942ca3b
treec2aedd51f56ee49222c76f44b238c16102132db1
parentac627b3d38d370027406c93c2dcaac0b1712a7d4
parent7e522859fc463a14875f78957bb57d2f33607d19
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>
31 files changed:
doc/Makefile
doc/filters.texi
doc/t2h.init
libavcodec/ac3dsp.c
libavcodec/cavsdsp.c
libavcodec/cavsdsp.h
libavcodec/dct.c
libavcodec/dct.h
libavcodec/fft.c
libavcodec/fft.h
libavcodec/fmtconvert.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/lpc.c
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
libavcodec/pngdsp.c
libavcodec/proresdsp.c
libavcodec/rv40dsp.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h
libavcodec/vp56dsp.c
libavcodec/vp8dsp.c
libavcodec/x86/Makefile
libavcodec/x86/cavsdsp.c
libavcodec/x86/fft_init.c
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/rv40dsp_init.c
libavcodec/x86/vc1dsp.h
libavcodec/x86/vc1dsp_mmx.c
libavformat/segment.c