Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Jun 2013 20:13:29 +0000 (22:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Jun 2013 20:13:35 +0000 (22:13 +0200)
* cehoyos/master:
  Autodetect idcin only if audio properties allow decoding.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge