diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 22:02:02 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 22:02:02 +0100 |
commit | d1c7a7776f6775cf43c3a5025d0544f0470125f4 (patch) | |
tree | 5df137fce84cf350c411a87805da88f7baf7d0d7 /libavformat/rtsp.c | |
parent | 5339a9f000519851d111d747a9c582981be7ee82 (diff) | |
parent | 159993acc7f4e3155510d42c543e09fe972b933c (diff) | |
download | ffmpeg-d1c7a7776f6775cf43c3a5025d0544f0470125f4.tar.gz |
Merge commit '159993acc7f4e3155510d42c543e09fe972b933c' into release/0.10
* commit '159993acc7f4e3155510d42c543e09fe972b933c':
vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors
wnv1: Make sure the input packet is large enough
dca: Validate the lfe parameter
rl2: Avoid a division by zero
wtv: Add more sanity checks for a length read from the file
segafilm: Validate the number of audio channels
qpeg: Add checks for running out of rows in qpeg_decode_inter
mpegaudiodec: Validate that the number of channels fits at the given offset
asv1: Verify the amount of extradata
idroqdec: Make sure a video stream has been allocated before returning packets
rv10: Validate the dimensions set from the container
xmv: Add more sanity checks for parameters read from the bitstream
ffv1: Make sure at least one slice context is initialized
truemotion2: Use av_freep properly in an error path
Conflicts:
libavcodec/qpeg.c
libavcodec/wnv1.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtsp.c')
0 files changed, 0 insertions, 0 deletions