[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.7' 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:43:33 2013 +0200| [9b0736c08ac59ae5da598ef32e9165ddf5c3f645] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

* qatar/release/0.7:
  Update changelog for 0.7.8 release
  aac: check the maximum number of channels
  oggdec: fix faulty cleanup prototype
  qdm2: check that the FFT size is a power of 2
  rv10: check that extradata is large enough
  lavf: make sure stream probe data gets freed.
  dfa: check for invalid access in decode_wdlt().
  avfiltergraph: check for sws opts being non-NULL before using them.

Conflicts:
	Changelog
	libavformat/utils.c

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

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





More information about the ffmpeg-cvslog mailing list