diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 19:58:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-10 19:58:19 +0200 |
| commit | 07206deed103452f4530fbae099d830244417944 (patch) | |
| tree | 3a574cbe37cc4d521fb59e37f0055e855e986277 /libavformat/flic.c | |
| parent | 0a3a0edd52b98aec27d1b8c63c85cb52ff46d40e (diff) | |
| parent | 1db88c33f2c0225aae160cc412b62dfaa3a34cbc (diff) | |
| download | ffmpeg-07206deed103452f4530fbae099d830244417944.tar.gz | |
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>
Diffstat (limited to 'libavformat/flic.c')
0 files changed, 0 insertions, 0 deletions