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)
commit37baeccef4e54105c0a4bf20bee6de81989f8a07
tree74278585af698675e954d927951d4511540a6334
parentb08cd2fb944d7ec4a9a07aa9d66f0a7d1b8df776
parent06bede95fcea47d2e51e8ff248c15311f335b898
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Autodetect idcin only if audio properties allow decoding.

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