diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-18 02:55:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-18 02:55:32 +0100 |
| commit | 95d6e5bdd58d5caaa52c57bad1e1d87df59fb7f8 (patch) | |
| tree | 2fc396cb5bebf8ea0f2f46ea55993f902a7ec5b2 /ffprobe.c | |
| parent | 640424e080cbff3733706321d05c32eb7c87b90b (diff) | |
| parent | bb4b0ad83b13c3af57675e80163f3f333adef96f (diff) | |
| download | ffmpeg-95d6e5bdd58d5caaa52c57bad1e1d87df59fb7f8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp5: Fix illegal read.
vp6: Fix illegal read.
tls: Use TLSv1_client_method for OpenSSL
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions