ffmpeg/tests
Michael Niedermayer 65e63072f8 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmp: Return a proper error code instead of -1
  rtmp: Check malloc calls
  rtmp: Check ff_rtmp_packet_create calls
  lavfi: add audio mix filter
  flvdec: Make sure sample_rate is set to the updated value
  tqi: Pass errors from the MB decoder

Conflicts:
	Changelog
	doc/filters.texi
	libavcodec/eatqi.c
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-25 00:38:16 +02:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-05-25 00:38:16 +02:00
ref fate: update checksum after pal8 changes 2012-05-24 14:15:10 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-20 22:58:04 +02:00
asynth1.sw
audiogen.c
base64.c
codec-regression.sh Add Avid Meridien Uncompressed (AVUI) encoder. 2012-05-22 20:33:24 +02:00
copycooker.sh
fate-run.sh ffprobe: remove ad-hoc behavior when nb_fmt_entries_to_show is 1 2012-05-21 10:32:25 +02:00
fate-update.sh
fate-valgrind.supp
fate.sh
fate_config.sh.template
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
lavfi-regression.sh
lena.pnm
md5.sh
regression-funcs.sh fate: remove unused code from regressions-funcs.sh 2012-05-18 14:00:36 +01:00
rotozoom.c Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
tiny_psnr.c
utils.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
videogen.c Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00