Michael Niedermayer 91eb1b1525 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (22 commits) prores: add FATE tests id3v2: reduce the scope of some non-globally-used symbols/structures id3v2: cosmetics: move some declarations before the places they are used shorten: remove the flush function. shn: do not allow seeking in the raw shn demuxer. avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK. avformat: update AVInputFormat allowed flags avformat: don't unconditionally call ff_read_frame_flush() when trying to seek. truespeech: use sizeof() instead of hardcoded sizes truespeech: remove unneeded variable, 'consumed' truespeech: simplify truespeech_read_frame() by using get_bits() truespeech: decode directly to output buffer instead of a temp buffer truespeech: check to make sure channels == 1 truespeech: check for large enough output buffer rather than truncating output truespeech: remove unneeded zero-size packet check. mlpdec: return meaningful error codes instead of -1 mlpdec: remove unnecessary wrapper function mlpdec: only calculate output size once mlpdec: validate that the reported channel count matches the actual output channel count pcm: reduce pointer type casting ... Conflicts: libavformat/avformat.h libavformat/id3v2.c libavformat/id3v2.h libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-10-14 03:48:22 +02:00
..
fate	Merge remote-tracking branch 'qatar/master'	2011-10-14 03:48:22 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2011-10-14 03:48:22 +02:00
audiogen.c
base64.c
codec-regression.sh	reg tests: add g723.1	2011-10-10 02:58:18 +02:00
copycooker.sh
fate2.mak
fate-run.sh	Merge remote-tracking branch 'qatar/master'	2011-10-10 03:50:58 +02:00
fate-update.sh
fate.mak	Merge remote-tracking branch 'qatar/master'	2011-10-08 03:39:01 +02:00
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh
lavfi-regression.sh
lena.pnm
Makefile	Merge remote-tracking branch 'qatar/master'	2011-10-14 03:48:22 +02:00
md5.sh
regression-funcs.sh	Merge remote-tracking branch 'qatar/master'	2011-10-10 03:50:58 +02:00
rotozoom.c
tiny_psnr.c
videogen.c