[FFmpeg-cvslog] Merge commit 'f844cb9bced3148fca2db5bbb092929526108005' into release/0.8

Michael Niedermayer git at videolan.org
Sun Oct 6 19:06:19 CEST 2013


ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 22 17:36:39 2013 +0200| [70a1182a484402fc893d7fe4530d7bb9d636524a] | committer: Michael Niedermayer

Merge commit 'f844cb9bced3148fca2db5bbb092929526108005' into release/0.8

* commit 'f844cb9bced3148fca2db5bbb092929526108005':
  iff: validate CMAP palette size
  wmaprodec: require block_align to be set.
  lzo: fix overflow checking in copy_backptr()
  flacdec: simplify bounds checking in flac_probe()
  atrac3: avoid oversized shifting in decode_bytes()
  lavf: fix arithmetic overflows in avformat_seek_file()

Conflicts:
	libavformat/iff.c

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

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





More information about the ffmpeg-cvslog mailing list