[FFmpeg-cvslog] Merge commit '5e8243e843be8f71da7dde199a71d095726533eb' into release/0.10

Michael Niedermayer git at videolan.org
Thu Jan 16 22:29:50 CET 2014


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

Merge commit '5e8243e843be8f71da7dde199a71d095726533eb' into release/0.10

* commit '5e8243e843be8f71da7dde199a71d095726533eb':
  bfi: Avoid divisions by zero
  electronicarts: Add more sanity checking for the number of channels
  riffdec: Add sanity checks for the sample rate
  mvi: Add sanity checking for the audio frame size
  xwma: Avoid division by zero
  avidec: Make sure a packet is large enough before reading its data
  vqf: Make sure the bitrate is in the valid range
  vqf: Make sure sample_rate is set to a valid value
  vc1dec: Undo mpegvideo initialization if unable to allocate tables

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list