Michael Niedermayer ab8cfd45f8 Merge remote branch 'qatar/master' ... * qatar/master: avio: add more documentation for AVIOContext. Parse sprite data for WMVP and WVP2, and decode sprites for the latter Replace outdated info on the FAQ Redefine sameq pad: fix example explanation gradfun: add notice from the MPlayer manual eval: add support for trunc, ceil, and floor functions documentation: add setdar and setsar description to filters.texi avio: document some members of AVIOContext. avio: document avio_close(). avio: cosmetics, vertically align comments. avio: cosmetics, group the reading functions. avio: cosmetics, merge all the FF_API_OLD_AVIO blocks. avio: cosmetics, move AVIOContext to start of the file. avio: update file header. os: fix OpenBSD/PowerPC compilation pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE oggdec: fix demuxing chained audio streams fix typo Conflicts: doc/filters.texi libavformat/avio.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-04-11 04:08:08 +02:00
..
cpu.c	Merge remote branch 'qatar/master'	2011-04-11 04:08:08 +02:00
intreadwrite.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
timer.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00