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)
commit0c2f673ed28ab6d187b4ce41396623f9e9378785
treef86207e19c7fec004e7f229b9ffc037682fff6da
parentb919a8d3a38559bb5f60a66839ca6f3358b1c908
parent33f64fd5d588a82b8bae1b1b5ea627c0c80b01d6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo4: expand allowed quantiser range
  configure: icl: Merge -Qdiag-error parameters

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