]> git.sesse.net Git - ffmpeg/commitdiff
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)
* qatar/master:
  vp5: Fix illegal read.
  vp6: Fix illegal read.
  tls: Use TLSv1_client_method for OpenSSL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vp5.c
libavcodec/vp6.c

Simple merge
Simple merge