Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 May 2012 22:38:16 +0000 (00:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 May 2012 22:38:16 +0000 (00:38 +0200)
commit65e63072f81641f50e5775be5c3b2873e8d6f38e
tree766617aff5fadbb6bee949ee7669c9431d00a374
parentba4aa656ce1c4e530bec4ed1b0fcf67eb20283f0
parenta4d3f3580bd993f4e8f4abc9c4ad486cb1c51987
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>
Changelog
doc/filters.texi
libavcodec/eatqi.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
libavformat/flvdec.c
libavformat/rtmppkt.c
libavformat/rtmpproto.c
tests/fate/audio.mak