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
..
acodec	Merge remote-tracking branch 'qatar/master'	2011-12-10 02:01:03 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2011-12-13 23:21:37 +01:00
lavf	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
lavfi	vf_scale: support PAL8 output by producing BGR8.	2011-12-05 20:05:44 +01:00
seek	Update seek reference for added metadata to lavf tests.	2011-12-12 21:54:52 +01:00
vsynth1	Merge remote-tracking branch 'qatar/master'	2011-12-11 01:05:33 +01:00
vsynth2	Merge remote-tracking branch 'qatar/master'	2011-12-11 01:05:33 +01:00