From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 19 Jun 2013 20:13:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'cehoyos/master'
X-Git-Tag: android-x86-4.4-r1~2790
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=37baeccef4e54105c0a4bf20bee6de81989f8a07;p=android-x86%2Fexternal-ffmpeg.git

Merge remote-tracking branch 'cehoyos/master'

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

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

37baeccef4e54105c0a4bf20bee6de81989f8a07