Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Jul 2011 07:27:28 +0000 (09:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Jul 2011 07:28:01 +0000 (09:28 +0200)
commit44187717c1611695ff441d22f29c7882bd318ae4
tree949776a1190eecf80b669ba277b2d83b952dd15d
parentfaa338183ba44051e05019411956b41c257c2510
parentca6a90465634152c7abe2f10112fd06dc778122f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: remove redundant setting of Altivec IDCT
  mpegvideo: initialise DSPContext in ff_dct_common_init()
  cosmetics: reindent
  eac3enc: support writing of basic mixing and info metadata
  dnxhdenc: fix declarations in for loops
  dsputil: remove stale bink prototypes and comments
  dsputil: move a bink-only function to binkdsp
  dsputil: remove some unused functions
  bink: make IDCT take 32-bit input

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
libavcodec/Makefile
libavcodec/ac3.h
libavcodec/ac3enc.c
libavcodec/ac3enc.h
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/bink.c
libavcodec/binkdata.h
libavcodec/binkdsp.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/mpegvideo.c
libavcodec/ppc/mpegvideo_altivec.c