1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavcodec
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
..
2011-12-13 23:07:40 +01:00
2011-12-11 00:32:25 +01:00
2011-12-10 11:58:03 +01:00
2011-12-11 00:32:25 +01:00
2011-12-03 03:00:49 +01:00
2011-12-03 03:00:44 +01:00
2011-12-13 15:46:23 +01:00
2011-12-05 03:22:06 +01:00
2011-12-13 21:08:43 +01:00
2011-12-13 20:01:49 +01:00
2011-12-13 21:08:43 +01:00
2011-12-02 03:23:07 +01:00
2011-12-13 19:54:31 +01:00