[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/9' into release/1.1

Michael Niedermayer git at videolan.org
Sun May 12 14:55:53 CEST 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 14:39:09 2013 +0200| [898ce4d6e2ef066619a97045b67e6e1ac4ad4bc3] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  update Changelog
  af_asyncts: fix offset calculation
  oma: properly forward errors in oma_read_packet
  indeo3: use unaligned reads on reference blocks.

Conflicts:
	Changelog

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

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





More information about the ffmpeg-cvslog mailing list