Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Jan 2012 05:53:33 +0000 (06:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Jan 2012 05:53:38 +0000 (06:53 +0100)
commit3b0b8c65313c4e47bf1662ecca64009aa3825024
tree20a50a27cf6a6e1a1d3fec401526ef6e6776ac13
parentcee1568ae18696919ad9cfea1d536364e4d53d9b
parent1f625431e2bb9564760fba3ab8077ae07ce7c7a1
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

* qatar/release/0.7:
  matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc()
  vorbis: Avoid some out-of-bounds reads
  vp3: fix oob read for negative tokens and memleaks on error. (cherry picked from commit 8370e426e42f2e4b9d14a1fb8107ecfe5163ce7f)
  avserver: Fix a bug where the socket is IPv4, but IPv6 is autoselected for the loopback address.
  vp3: fix streams with non-zero last coefficient

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffserver.c
libavcodec/vorbis.c
libavcodec/vp3.c
libavformat/matroskadec.c