Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jul 2012 20:27:46 +0000 (22:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jul 2012 20:34:48 +0000 (22:34 +0200)
commit204c4e953d895e15ab0908d715fd46181bf32add
treeaebdffe23aa1133eeb1db55b810135ecdfe1c188
parentc66978e29ad9cae2c71da83857c6a3cec11bb9cb
parentffdd93a25e64db82c053577f415ea82c54fd5235
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: fix build with altivec disabled
  vp3: move idct and loop filter pointers to new vp3dsp context
  build: add CONFIG_VP3DSP, reduce repetition in OBJS lists
  tscc2: do not add/subtract 128 bias during DCT
  tscc2: fix typo in DCT
  configure: clarify external library section of help output
  configure: mark libfdk-aac as nonfree
  configure: cosmetics: drop some unnecessary backslashes
  os_support: K&R formatting cosmetics

Conflicts:
configure
libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
21 files changed:
configure
libavcodec/Makefile
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/vp3dsp_init_arm.c
libavcodec/arm/vp3dsp_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/vp3dsp_altivec.c
libavcodec/tscc2.c
libavcodec/vp3.c
libavcodec/vp3dsp.c
libavcodec/vp3dsp.h
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp3dsp_init.c
libavformat/os_support.c