Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Dec 2011 22:21:37 +0000 (23:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Dec 2011 22:21:37 +0000 (23:21 +0100)
commit3ba0bfe71fb18e955ca0110e5a65105d84932fbc
treeb308d41d170483c23c31c87d8dcb19fc169e2eb6
parent36be045ed7942e07742c3cf3d3012b1d2a9ec344
parenta99273ebf328658c183c2d267f1c2b8bfac58bb3
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>
26 files changed:
Makefile
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/intrax8.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h
libavcodec/rv10.c
libavcodec/rv34.c
libavcodec/ulti.c
libavcodec/vc1dec.c
libavdevice/Makefile
libavfilter/Makefile
libavfilter/vf_yadif.c
libavformat/Makefile
libavformat/utils.c
libavutil/Makefile
libpostproc/Makefile
libswresample/Makefile
libswscale/Makefile
tests/ref/fate/wmv8-drm