4 Commits

Author	SHA1	Message	Date
Michael Niedermayer	3ba0bfe71f	Merge remote-tracking branch 'qatar/master' ... * qatar/master: ulti: Fix invalid reads lavf: dealloc private options in av_write_trailer yadif: support 10bit YUV vc1: mark with ER_MB_ERROR bits overconsumption lavc: introduce ER_MB_END and ER_MB_ERROR error_resilience: use the ER_ namespace build: move inclusion of subdir.mak to main subdir loop rv34: NEON optimised 4x4 dequant rv34: move 4x4 dequant to RV34DSPContext aacdec: Use intfloat.h rather than local punning union. Conflicts: libavcodec/h264.c libavcodec/vc1dec.c libavfilter/vf_yadif.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>	2011-12-13 23:21:37 +01:00
Clément Bœsch	7e516a11ca	swr: rename resample2 to resample.	2011-11-16 07:27:20 +01:00
Michael Niedermayer	9dd3da1061	swr: fix shared lib build ... Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2011-09-19 07:26:42 +02:00
Michael Niedermayer	b5875b9111	Add libswresample. ... Similar to libswscale this does resampling and format convertion, just for audio instead of video. changing sampling rate, sample formats, channel layouts and sample packing all in one with a very simple public interface. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2011-09-19 07:04:17 +02:00