Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 12:39:09 +0000 (14:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 12:39:09 +0000 (14:39 +0200)
commit898ce4d6e2ef066619a97045b67e6e1ac4ad4bc3
treee343618996d0d87d6eb8338da29e42919d2a8852
parent93f80cf2cc506aa597283bf38d670496d594c09f
parentd2d38531d608d94ae78e65172c19d1c3f17d2a45
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@gmx.at>
Changelog
libavcodec/indeo3.c
libavfilter/af_asyncts.c
libavformat/omadec.c