[FFmpeg-cvslog] Merge commit '327ff82bac3081d918dceb4931c77e25d0a1480d' into release/0.10

Michael Niedermayer git at videolan.org
Sun Apr 7 15:54:21 CEST 2013


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  7 15:42:45 2013 +0200| [e9d5a6f1c5b65319400a45446ae6523a2296de73] | committer: Michael Niedermayer

Merge commit '327ff82bac3081d918dceb4931c77e25d0a1480d' into release/0.10

* commit '327ff82bac3081d918dceb4931c77e25d0a1480d':
  msrle: convert MS RLE decoding function to bytestream2.
  Update Changelog for the 0.8.6 Release
  wmaprodec: require block_align to be set.
  ivi_common: do not call MC for intra frames when dc_transform is unset
  roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
  Revert "libmp3lame: use the correct remaining buffer size when flushing"
  lzo: fix overflow checking in copy_backptr()
  flacdec: simplify bounds checking in flac_probe()
  atrac3: avoid oversized shifting in decode_bytes()
  avconv: skip attached files when selecting streams to read from.
  lavf: fix arithmetic overflows in avformat_seek_file()

Conflicts:
	Changelog
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/msrledec.c
	libavformat/utils.c

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

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





More information about the ffmpeg-cvslog mailing list