Michael Niedermayer
f97faf6751
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
id3v2: fix doxy comment - 'machine byte order' makes no sense on char arrays
VC1: restore mistakenly removed code
twinvq: check output buffer size before decoding
twinvq: return an error when the packet size is too small
lavf: export some forgotten symbols with non-av prefixes.
swscale: update altivec yuv2planeX asm to new per-plane API.
swscale: make yuv2yuvX_10_sse2/avx 8/9/16-bits aware.
yuv2planeX10 SIMD
swscale: decide whether to use yuv2plane1/X on a per-plane basis.
swscale: reintroduce full precision in 16-bit output.
Split up yuv2yuvX functions
Split out yuv2yuv1 luma and chroma in order to make them generic DSP functions
lavc: replace references to deprecated AVCodecContext.error_recognition to use AVCodecContext.err_recognition
lavc: translate non-flag-based er options into flag-based ef options at codec open
add -err_filter AVOptions to access flag-based error recognition
h264_weight: initialize "height" function argument properly.
presets: spelling error in libvpx 1080p50_60
avplay: fix fullscreen behaviour with SDL 1.2.14 on Mac OS X
Conflicts:
ffplay.c
libavformat/libavformat.v
libswscale/swscale.c
libswscale/x86/swscale_template.c
tests/ref/lavfi/pixfmts_scale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-23 05:13:56 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-09-26 00:24:01 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-17 03:38:47 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-14 22:24:00 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-04 00:45:21 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-01 03:48:33 +02:00
2011-07-03 03:14:10 +02:00
2011-10-18 01:54:40 +02:00
2011-10-20 02:34:51 +02:00
2011-09-08 22:37:31 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-16 02:38:02 +02:00
2011-10-16 02:43:36 +02:00
2011-10-20 02:34:51 +02:00
2011-10-16 21:51:28 +02:00
2011-08-01 00:58:49 +02:00
2011-10-20 02:34:51 +02:00
2011-08-22 09:35:58 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-12 16:51:16 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-09-07 07:27:55 +02:00
2011-10-21 02:01:26 +02:00
2011-10-07 22:28:07 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-09-07 02:36:42 +02:00
2011-10-22 01:16:41 +02:00
2011-10-22 01:16:41 +02:00
2011-07-17 20:12:02 +02:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-10-21 02:01:26 +02:00
2011-09-28 18:13:52 +02:00
2011-10-13 06:00:03 +02:00
2011-10-14 03:48:22 +02:00
2011-10-23 05:13:56 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-24 22:39:52 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-17 22:36:43 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-22 02:23:56 +02:00
2011-08-26 01:29:40 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-23 05:13:56 +02:00
2011-10-17 07:33:10 +02:00
2011-10-20 02:34:51 +02:00
2011-07-06 01:34:08 +02:00
2011-10-20 02:34:51 +02:00
2011-08-20 00:27:38 +02:00
2011-10-20 02:34:51 +02:00
2011-10-22 01:16:41 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-04 00:45:21 +02:00
2011-10-23 00:54:56 +02:00
2011-10-19 11:20:48 +02:00
2011-07-11 04:23:25 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-10-21 22:35:07 +02:00
2011-10-21 02:01:26 +02:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-27 22:27:52 +02:00
2011-10-20 02:34:51 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-26 13:51:29 +02:00
2011-10-21 02:01:26 +02:00
2011-10-05 04:07:59 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 13:06:16 -04:00
2011-10-20 20:57:23 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-07-04 00:45:21 +02:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-17 22:36:43 +02:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-07-14 20:44:58 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-09-23 00:35:31 +02:00
2011-10-18 01:54:40 +02:00
2011-09-27 02:14:37 +02:00
2011-09-08 22:37:31 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-18 01:54:40 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-10-18 01:54:40 +02:00
2011-10-18 01:54:40 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-21 02:01:26 +02:00
2011-08-26 23:18:54 +02:00
2011-07-04 00:45:21 +02:00
2011-10-20 02:34:51 +02:00
2011-10-17 16:51:48 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-08-25 21:43:30 +02:00
2011-07-14 20:44:58 +02:00
2011-10-21 22:27:02 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-19 17:02:11 +02:00
2011-09-08 01:55:07 +02:00
2011-10-20 02:34:51 +02:00
2011-09-26 00:22:41 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
f97faf6751