Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Jun 2013 08:27:41 +0000 (10:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Jun 2013 08:27:47 +0000 (10:27 +0200)
* qatar/master:
  indeo4: expand allowed quantiser range
  configure: icl: Merge -Qdiag-error parameters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/ivi_common.c

diff --cc configure
Simple merge
Simple merge