]> git.sesse.net Git - ffmpeg/commit
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Nov 2011 01:55:19 +0000 (02:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Nov 2011 01:55:32 +0000 (02:55 +0100)
commit95d6e5bdd58d5caaa52c57bad1e1d87df59fb7f8
tree2fc396cb5bebf8ea0f2f46ea55993f902a7ec5b2
parent640424e080cbff3733706321d05c32eb7c87b90b
parentbb4b0ad83b13c3af57675e80163f3f333adef96f
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>
libavcodec/vp5.c
libavcodec/vp6.c