Michael Niedermayer
2f56a97f24
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (22 commits)
H.264: fix filter_mb_fast with 4:4:4 + 8x8dct
alsa: limit buffer_size to 32768 frames.
alsa: fallback to buffer_size/4 for period_size.
doc: replace @pxref by @ref where appropriate
mpeg1video: don't abort if thread_count is too high.
segafilm: add support for videos with cri adx adpcm
gxf: Fix 25 fps DV material in GXF being misdetected as 50 fps
libxvid: Add const qualifier to silence compiler warning.
H.264: improve qp_thresh check
H.264: use fill_rectangle in CABAC decoding
H.264: Remove redundant hl_motion_16/8 code
H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIP
H.264: faster P-SKIP decoding
H.264: av_always_inline some more functions
H.264: Add x86 assembly for 10-bit H.264 predict functions
swscale: rename uv_off/uv_off2 to uv_off_px/byte.
swscale: implement error dithering in planarCopyWrapper.
swscale: error dithering for 16/9/10-bit to 8-bit.
swscale: fix overflow in 16-bit vertical scaling.
swscale: fix crash in 8-bpc bilinear output without alpha.
...
Conflicts:
doc/developer.texi
libavdevice/alsa-audio.h
libavformat/gxf.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_crop
tests/ref/lavfi/pixfmts_hflip
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-10 04:28:50 +02:00
2011-07-06 01:34:08 +02:00
2011-07-06 01:34:08 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-07-10 04:28:50 +02:00
2011-06-02 20:06:00 +01:00
2011-05-22 04:53:19 +02:00
2011-06-08 05:25:28 +02:00
2011-07-03 03:14:10 +02:00
2011-06-30 04:32:24 +02:00
2011-07-01 05:35:26 +02:00
2011-06-30 04:32:24 +02:00
2011-07-01 05:35:26 +02:00
2011-07-04 00:45:21 +02:00
2011-06-30 04:32:24 +02:00
2011-07-03 03:14:10 +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-07-03 03:14:10 +02:00
2011-07-02 03:24:32 +02:00
2011-05-29 03:34:35 +02:00
2011-05-29 03:34:35 +02:00
2011-07-02 03:24:32 +02:00
2011-07-02 03:24:32 +02:00
2011-06-13 16:49:35 -04:00
2011-07-01 13:02:11 -04:00
2011-06-29 05:23:12 +02:00
2011-07-02 03:24:32 +02:00
2011-05-25 06:32:45 +02:00
2011-05-25 06:32:45 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-05-29 03:34:35 +02:00
2011-06-21 03:38:25 +02:00
2011-07-03 03:14:10 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-05-27 02:53:21 +02:00
2011-07-06 23:57:11 +02:00
2011-07-05 17:38:37 +02:00
2011-07-03 03:14:10 +02:00
2011-06-21 03:38:25 +02:00
2011-06-21 03:38:25 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-02 20:06:00 +01:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-06-21 21:03:46 -07:00
2011-07-05 02:26:17 +02:00
2011-06-18 11:36:35 +02:00
2011-07-05 02:26:17 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-07-09 02:06:40 +02:00
2011-06-26 14:09:48 -07:00
2011-06-08 05:25:28 +02:00
2011-07-06 01:34:08 +02:00
2011-07-02 03:24:32 +02:00
2011-07-02 03:24:32 +02:00
2011-05-22 04:53:19 +02:00
2011-07-05 18:46:23 +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-07-09 17:30:25 +02:00
2011-07-09 17:21:31 +02:00
2011-06-27 12:59:39 -04:00
2011-06-07 15:16:41 -04:00
2011-06-21 03:38:25 +02:00
2011-06-27 03:32:45 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 00:45:21 +02:00
2011-06-19 03:54:15 +02:00
2011-07-09 02:06:40 +02:00
2011-07-04 00:45:21 +02:00
2011-05-22 04:53:19 +02:00
2011-06-24 03:07:04 +02:00
2011-07-02 03:24:32 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-07-01 03:04:46 +02:00
2011-07-10 04:28:50 +02:00
2011-07-04 00:45:21 +02:00
2011-06-02 10:16:20 -07:00
2011-07-10 04:28:50 +02:00
2011-07-10 04:28:50 +02:00
2011-06-24 03:07:04 +02:00
2011-06-23 04:49:04 +02:00
2011-07-10 04:28:50 +02:00
2011-07-10 04:28:50 +02:00
2011-07-06 01:34:08 +02:00
2011-06-15 02:15:25 +02:00
2011-07-06 01:34:08 +02:00
2011-07-06 01:34:08 +02:00
2011-07-05 02:26:17 +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-07-04 00:45:21 +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-05-22 04:53:19 +02:00
2011-06-24 03:07:04 +02:00
2011-06-06 03:33:58 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-06-15 10:57:26 +02:00
2011-07-08 01:05:28 +02:00
2011-07-06 01:34:08 +02:00
2011-07-09 02:06:40 +02:00
2011-07-08 01:05:28 +02:00
2011-07-05 02:26:17 +02:00
2011-07-05 02:26:17 +02:00
2011-06-21 04:45:29 +02:00
2011-07-10 04:28:50 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-09 02:06:40 +02:00
2011-06-05 03:00:31 +02:00
2011-07-04 00:45:21 +02:00
2011-06-15 01:16:58 +02:00
2011-05-23 01:23:33 +02:00
2011-06-08 05:25:28 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +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-05-22 04:53:19 +02:00
2011-07-01 03:04:46 +02:00
2011-06-27 03:32:45 +02:00
2011-07-04 00:45:21 +02:00
2011-06-03 05:19:30 +02:00
2011-06-21 03:07:11 +02:00
2011-05-22 04:53:19 +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-07-04 00:45:21 +02:00
2011-06-03 05:19:30 +02:00
2011-07-10 04:28:50 +02:00
2011-07-05 02:26:17 +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-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-05-25 06:32:45 +02:00
2011-05-21 13:48:10 +02:00
2011-06-24 03:07:04 +02:00
2011-07-04 12:54:26 +02:00
2011-06-18 05:10:38 +02:00
2011-05-22 04:53:19 +02:00
2011-07-04 00:45:21 +02:00
2011-07-01 05:35:26 +02:00
2011-06-03 05:19:30 +02:00
2011-06-30 04:32:24 +02:00
2011-06-30 04:32:24 +02:00
2011-06-03 05:19:30 +02:00
2011-07-03 03:14:10 +02:00
2011-07-03 03:14:10 +02:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-06-20 21:03:59 +02:00
2011-06-08 16:38:37 +02:00
2011-07-06 10:05:08 +02:00
2011-07-06 10:05:08 +02:00
2011-05-22 04:53:19 +02:00
2011-06-21 03:38:25 +02:00
2011-06-24 03:07:04 +02:00
2011-06-03 05:19:30 +02:00
2011-07-05 02:26:17 +02:00
2011-07-03 03:14:10 +02:00
2011-06-07 03:37:57 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-20 04:07:34 +02:00
2011-06-20 04:07:34 +02:00
2011-07-04 00:45:21 +02:00
2011-06-02 20:06:00 +01:00
2011-06-07 13:20:57 +02:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-06-28 18:48:35 +02:00
2011-05-22 04:53:19 +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-24 03:07:04 +02:00
2011-07-04 00:45:21 +02:00
2011-06-08 05:25:28 +02:00
2011-06-24 03:07:04 +02:00
2011-05-30 00:24:01 +02:00
2011-06-24 03:07:04 +02:00
2011-06-24 03:07:04 +02:00
2011-07-03 03:14:10 +02:00
2011-07-05 02:26:17 +02:00
2011-07-04 00:02:37 -07:00
2011-06-24 03:07:04 +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-07-05 02:26:17 +02:00
2011-05-22 04:53:19 +02:00
2011-05-22 04:53:19 +02:00
2011-06-03 05:19:30 +02:00
2011-06-19 03:54:15 +02:00
2011-06-21 13:17:10 +02:00
2011-06-04 06:35:17 +02:00
2011-07-03 03:14:10 +02:00
2011-07-04 00:45:21 +02:00
2011-06-24 03:07:04 +02:00
2011-05-22 04:53:19 +02:00
2011-06-02 20:06:00 +01:00
2f56a97f24