diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 14:39:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 14:39:09 +0200 |
| commit | 898ce4d6e2ef066619a97045b67e6e1ac4ad4bc3 (patch) | |
| tree | e343618996d0d87d6eb8338da29e42919d2a8852 /libavcodec/mss3.c | |
| parent | 93f80cf2cc506aa597283bf38d670496d594c09f (diff) | |
| parent | d2d38531d608d94ae78e65172c19d1c3f17d2a45 (diff) | |
| download | ffmpeg-898ce4d6e2ef066619a97045b67e6e1ac4ad4bc3.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mss3.c')
0 files changed, 0 insertions, 0 deletions