Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jan 2012 00:12:34 +0000 (01:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 4 Jan 2012 00:12:34 +0000 (01:12 +0100)
commitad1c8dd6734f0aa7a7a87b4669a166715c114b46
treec03c08f30bf1a7e8d9859abc48de3391bb05c6a0
parentd6da16dca5a64ed7ab2db54710a0c703f179d3ba
parentfd16f567987524a769d5d4f1f69089f000386ac2
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add dxtory test
  adx_parser: rewrite.
  adxdec: Validate channel count to fix a division by zero.
  adxdec: Do not require extradata.
  cmdutils: K&R reformatting cosmetics
  alacdec: implement the 2-pass prediction type.
  alacenc: implement the 2-pass prediction type.
  alacenc: do not generate invalid multi-channel ALAC files
  alacdec: fill in missing or guessed info about the extradata format.
  utvideo: proper median prediction for interlaced videos
  lavu: bump lavu minor for av_popcount64
  dca: K&R formatting cosmetics
  dct: K&R formatting cosmetics
  lavf: flush decoders in avformat_find_stream_info().
  win32: detect number of CPUs using affinity
  Add av_popcount64
  snow: Restore three mistakenly removed casts.

Conflicts:
cmdutils.c
doc/APIchanges
libavcodec/adx_parser.c
libavcodec/adxdec.c
libavcodec/alacenc.c
libavutil/avutil.h
tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
cmdutils.c
configure
doc/APIchanges
libavcodec/adxdec.c
libavcodec/alac.c
libavcodec/alacenc.c
libavcodec/dca.c
libavcodec/dct.c
libavcodec/pthread.c
libavcodec/snow.c
libavcodec/utvideo.c
libavformat/utils.c
libavutil/avutil.h
libavutil/common.h
tests/fate/screen.mak