ffmpeg/libpostproc
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
..
libpostproc.v
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-13 23:21:37 +01:00
postprocess_altivec_template.c
postprocess_internal.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
postprocess_template.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
postprocess.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
postprocess.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00