Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 May 2012 19:12:34 +0000 (21:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 May 2012 19:12:34 +0000 (21:12 +0200)
commit2330eb147412b96bef148b120e5a3897c9c87858
treef53aa47a22318e11b2b2cc39784798a9cd3aa9cf
parent2cda0429aa764d157569d7534777c58dac8a4962
parentababec7b95d84e911ecda6056e8b8c90287a6e7a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: intreadwrite: disable inline asm for gcc 4.7 and later
  arm: intreadwrite: fix inline asm constraints for gcc 4.6 and later
  indeo3: fix motion vector validation
  pcm_bluray: set bits_per_raw_sample for > 16-bit
  twinvq: fix out of bounds array access
  lavr: use 8.8 instead of 10.6 as the 16-bit fixed-point mixing coeff type

Conflicts:
doc/APIchanges
libavcodec/indeo3.c
libavcodec/pcm-mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/twinvq.c
libavutil/arm/intreadwrite.h