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-06-24 03:07:04 +02:00
2011-06-23 07:31:54 +01:00
2011-08-03 11:56:58 +03:00
2011-10-22 11:11:08 +02:00
2011-07-06 00:29:59 +01:00
2011-10-24 01:01:21 +02:00
2011-11-23 04:02:17 +01:00
2011-11-25 13:19:53 +00:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-06-30 04:32:24 +02:00
2011-11-24 03:32:24 +01:00
2011-07-22 12:08:52 +02:00
2011-07-21 16:28:53 +02:00
2011-07-22 12:08:52 +02:00
2011-12-02 00:51:11 +01:00
2011-05-27 23:48:22 +02:00
2011-03-19 13:33:20 +00:00
2011-07-22 12:08:52 +02:00
2011-12-02 00:51:11 +01:00
2011-06-24 03:07:04 +02:00
2011-04-04 02:15:12 +02:00
2011-07-06 01:34:08 +02:00
2011-03-21 03:33:28 +01:00
2011-11-24 03:32:24 +01:00
2011-03-19 13:33:20 +00:00
2011-11-24 03:32:24 +01:00
2011-06-24 03:07:04 +02:00
2011-12-06 13:48:25 +00:00
2011-10-22 01:16:41 +02:00
2011-12-07 02:04:00 +01:00
2011-11-24 03:32:24 +01:00
2011-10-21 01:00:41 -07:00
2011-07-11 04:23:25 +02:00
2011-11-24 03:32:24 +01:00
2011-06-13 12:30:22 +01:00
2011-12-07 02:04:00 +01:00
2011-06-24 03:07:04 +02:00
2011-04-03 22:39:52 +01:00
2011-11-24 03:32:24 +01:00
2011-06-23 07:31:54 +01:00
2011-06-13 11:33:44 +01:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-07-16 19:43:35 +02:00
2011-06-24 03:07:04 +02:00
2011-12-02 19:59:18 +00:00
2011-06-24 03:07:04 +02:00
2011-12-13 12:06:21 +00:00
2011-12-13 12:06:21 +00:00
2011-12-07 22:38:14 +00:00
2011-12-07 22:38:14 +00:00
2011-11-24 03:32:24 +01:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-06-24 03:07:04 +02:00
2011-07-11 04:23:25 +02:00
2011-07-11 04:23:25 +02:00
2011-05-22 04:53:19 +02:00
2011-10-03 01:49:36 +02:00
2011-10-03 01:49:36 +02:00
2011-12-03 03:00:30 +01:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00