Michael Niedermayer
6cbe81999b
Merge remote-tracking branch 'qatar/master'
* qatar/master: (28 commits)
Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
x86: cabac: fix register constraints for 32-bit mode
cabac: move x86 asm to libavcodec/x86/cabac.h
x86: h264: cast pointers to intptr_t rather than int
x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
x86: cabac: remove hardcoded esi in get_cabac_inline()
x86: cabac: remove hardcoded edx in get_cabac_inline()
x86: cabac: remove unused macro parameter
x86: cabac: remove hardcoded ebx in inline asm
x86: cabac: remove hardcoded struct offsets from inline asm
cabac: remove inline asm under #if 0
cabac: remove BRANCHLESS_CABAC_DECODER switch
cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED
document libswscale bump
error_resilience: skip last-MV predictor step if MVs are not available.
error_resilience: actually add counter when adding a MV predictor.
...
Conflicts:
Changelog
libavcodec/error_resilience.c
libavfilter/defaults.c
libavfilter/vf_drawtext.c
libswscale/swscale.h
tests/ref/vsynth1/error
tests/ref/vsynth2/error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-21 03:38:25 +02:00
..
2011-06-01 13:02:08 +02:00
2011-06-21 03:38:25 +02:00
2011-05-11 13:43:30 +02:00
2011-03-17 17:26:45 +01:00
2011-03-29 02:27:13 +02:00
2011-05-20 10:14:00 +02:00
2011-04-22 03:54:30 +02:00
2011-05-27 12:48:43 +02:00
2011-06-02 14:43:29 +02:00
2011-06-07 00:37:00 +02:00
2011-04-24 03:41:22 +02:00
2011-05-27 10:41:46 +02:00
2011-04-19 01:17:59 +02:00
2011-06-18 09:36:07 +02:00
2011-06-08 01:30:52 +02:00
2011-06-05 13:31:47 +02:00
2011-03-13 18:45:29 -04:00
2011-04-24 03:41:22 +02:00
2011-03-17 17:26:45 +01:00
2011-06-19 19:18:33 +02:00
2011-05-29 03:34:35 +02:00
2011-04-10 04:31:54 +02:00
2011-03-29 02:46:11 +02:00
2011-05-09 04:13:55 +02:00
2011-03-17 17:26:45 +01:00
2011-03-17 17:26:45 +01:00
2011-03-17 17:26:45 +01:00
2011-05-28 12:15:55 +02:00
2011-04-08 01:35:43 +02:00
2011-06-05 13:17:38 +02:00
2011-04-08 02:50:13 +02:00
2009-03-30 10:39:20 +00:00
2011-06-20 04:07:34 +02:00
2008-02-08 19:17:46 +00:00
2011-03-17 17:26:45 +01:00
2010-03-05 08:34:31 +00:00
2011-01-30 03:41:47 +01:00
2010-06-27 14:31:50 +00:00
2011-03-25 09:48:31 -04:00
2011-02-09 03:33:54 +01:00
2009-03-03 15:35:20 +00:00