• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 65e63072
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    65e63072
To find the state of this project's repository at the time of any of these versions, check out the tags.
Changelog 32.8 KB