[FFmpeg-cvslog] Merge commit '54e03863691dcae73260f70108b3731b70773e7c' into release/0.10

Michael Niedermayer git at videolan.org
Wed Sep 25 23:34:51 CEST 2013


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 25 23:03:08 2013 +0200| [210a437e105fbd92f1dd9c2c82f4a5efd80ca8fd] | committer: Michael Niedermayer

Merge commit '54e03863691dcae73260f70108b3731b70773e7c' into release/0.10

* commit '54e03863691dcae73260f70108b3731b70773e7c':
  vc1: check the source buffer in vc1_mc functions
  bink: Bound check the quantization matrix.
  xl: Make sure the width is valid
  alsdec: Fix the clipping range
  dsicinav: Bound-check the source buffer when needed
  mov: Do not allow updating the time scale after it has been set
  ac3dec: Don't consume more data than the actual input packet size
  indeo: Reject impossible FRAMETYPE_NULL

Conflicts:
	libavcodec/alsdec.c

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

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





More information about the ffmpeg-cvslog mailing list