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