Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 May 2012 17:32:06 +0000 (19:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 May 2012 17:32:06 +0000 (19:32 +0200)
commita1fc1d2e1b4a5bcfd07549dce9735f24237aa32e
tree924f2f1428ad37e7265a8effffd0158bb2a4ef48
parent39f0a45a1a087e5bbef84fa3366942384ec32155
parentd041dec3cba300aef6e489990be7242dcd808441
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pcm-mpeg: improve log message wording
  fate: add missing $(TARGET_PATH) to ac3-fixed-encode
  fate: fix md5sum replacement on some systems
  avprobe: correctly set the default formatter
  lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs
  lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs
  lavr: add C functions for mixing 2 to 1 channels with s16p format
  avprobe: move formatter functions in the context

Conflicts:
ffprobe.c
libavcodec/pcm-mpeg.c
tests/fate/ac3.mak

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