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-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-06-20 23:36:40 +01:00
2011-05-24 04:35:08 +02:00
2011-05-15 04:44:07 +02:00
2011-06-19 04:02:06 +02:00
2011-05-21 05:32:03 +02:00
2011-05-18 05:42:42 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-22 13:41:13 +02:00
2011-05-22 04:53:19 +02:00
2011-05-19 13:00:31 +02:00
2011-05-23 04:29:51 +02:00
2011-06-18 07:52:19 -04:00
2011-05-15 04:44:07 +02:00
2011-06-16 23:18:50 +02:00
2011-06-16 23:18:50 +02:00
2011-06-21 03:38:25 +02:00
2011-06-13 21:16:30 -07:00
2011-06-15 02:15:25 +02:00
2011-06-06 01:31:02 +02:00
2011-06-08 05:25:28 +02:00
2011-06-03 05:19:30 +02:00
2011-05-15 04:44:07 +02:00
2011-06-16 23:18:50 +02:00
2011-06-19 04:02:06 +02:00
2011-05-20 05:48:22 +02:00
2011-05-15 04:44:07 +02:00
2011-05-15 04:44:07 +02:00
2011-05-18 05:42:42 +02:00
2011-05-15 04:44:07 +02:00
2011-05-20 17:52:21 +02:00
2011-05-23 04:29:51 +02:00