[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.8' into release/0.10

Michael Niedermayer git at videolan.org
Sun Apr 7 16:08:22 CEST 2013


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  7 15:57:13 2013 +0200| [566de83883cab02d113fd82b5d3013a770162620] | committer: Michael Niedermayer

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

* qatar/release/0.8:
  update Changelog
  fate: fetch samples that match the release series
  dxva2: include dxva.h if found
  iff: validate CMAP palette size
  Changelog: document msrle bugfix
  Changelog: cosmetics, remove trailing periods and sort
  msrledec: check bounds before constructing a possibly invalid pointer,

Conflicts:
	Changelog
	configure
	libavformat/iff.c
	tests/Makefile

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

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





More information about the ffmpeg-cvslog mailing list