From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 6 Mar 2013 23:27:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-4.4-r1~5336
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=38d40ac18a3855620852e6552114caeb413497eb;p=android-x86%2Fexternal-ffmpeg.git

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: Make sure the encoder exists before inspecting supported_list

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

38d40ac18a3855620852e6552114caeb413497eb