[FFmpeg-cvslog] Merge commit '159993acc7f4e3155510d42c543e09fe972b933c' into release/0.10

Michael Niedermayer git at videolan.org
Thu Jan 16 22:08:52 CET 2014


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 16 22:02:02 2014 +0100| [d1c7a7776f6775cf43c3a5025d0544f0470125f4] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1c7a7776f6775cf43c3a5025d0544f0470125f4
---





More information about the ffmpeg-cvslog mailing list