• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 52dc18d4
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    52dc18d4
segment.c 19.2 KB