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
..
2011-12-15 18:38:06 +01:00
2012-02-27 00:00:55 +01:00
2012-01-24 16:03:09 +01:00
2012-05-22 00:39:53 +02:00
2012-01-28 11:04:19 +01:00
2012-05-22 00:39:53 +02:00
2012-05-22 00:39:53 +02:00
2012-05-22 00:39:53 +02:00
2012-01-04 13:21:08 +01:00
2012-01-26 21:59:09 +01:00
2012-03-13 01:14:04 +01:00
2012-05-22 00:39:53 +02:00
2012-03-20 11:10:25 +00:00