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)
* 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>
1  2 
libavformat/utils.c

Simple merge