Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Sep 2012 08:09:55 +0000 (10:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Sep 2012 08:35:26 +0000 (10:35 +0200)
commitf1ca40ee00402102046fc7e59606651930436b0e
treed64b21cfabf26f3a2b1a3208745b6cc7e7081a26
parentab94d1be7a32f6d3714935ad5ae551a753024ae6
parent1c56cdad337a39951f26b17bdc8068d75a19ffca
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  riff: Add SVQ3 fourcc
  fate: ac3: add 4.0 and downmix tests
  configure: x86: improve ebp availability check
  vorbisdec: ensure FASTDIV denominator is never 1
  avformat: refactor avformat_close_input
  avformat: simplify avformat_close_input

Conflicts:
configure
libavcodec/vorbisdec.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vorbisdec.c
libavformat/utils.c
tests/fate/ac3.mak