Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 17:58:15 +0000 (19:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jul 2013 17:58:19 +0000 (19:58 +0200)
commit07206deed103452f4530fbae099d830244417944
tree3a574cbe37cc4d521fb59e37f0055e855e986277
parent0a3a0edd52b98aec27d1b8c63c85cb52ff46d40e
parent1db88c33f2c0225aae160cc412b62dfaa3a34cbc
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>
libavformat/utils.c