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
..
audioconvert.c	swr: handle correctly muted channel with u8 sample fmt.	2011-11-29 17:14:25 +01:00
audioconvert.h
libswresample.v
Makefile	Merge remote-tracking branch 'qatar/master'	2011-12-13 23:21:37 +01:00
rematrix.c
rematrix_template.c
resample.c
swresample.c	swr: fix invalid sample format message.	2011-11-24 16:55:45 +01:00
swresample.h	swr: use native planar sample formats.	2011-11-24 16:55:45 +01:00
swresample_internal.h
swresample_test.c	swr-test: drop one const, silence most const qualifer warnings.	2011-12-03 00:46:46 +01:00