From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 10 Jul 2013 17:58:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'cehoyos/master'
X-Git-Tag: android-x86-4.4-r1~2420
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=07206deed103452f4530fbae099d830244417944;p=android-x86%2Fexternal-ffmpeg.git

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Suggest recompilation with openssl or gnutls if the https protocol is not found.
  lavf/utils.c: Avoid a null pointer dereference on oom after duration_error allocation.

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

07206deed103452f4530fbae099d830244417944