aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-08 05:03:35 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-08 05:03:39 +0100
commit7209c2b13f0bfaf4029ebb54a18ebb6959d2e3a3 (patch)
treed9b2115c63a03d547094eb5e430297e5339f0b92 /ffserver.c
parente75056bc549fe13bb6d29a8a67a6a2babf060417 (diff)
parent7ee536e87a569174775dabdd959a9b12c1d2ac3d (diff)
downloadffmpeg-7209c2b13f0bfaf4029ebb54a18ebb6959d2e3a3.tar.gz
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
* qatar/release/0.5: 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. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions