Michael Niedermayer
18d0a16fc9
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
swscale: make yuv2yuv1 use named registers.
h264: mark h264_idct_add8_10 with number of XMM registers.
swscale: fix V plane memory location in bilinear/unscaled RGB/YUYV case.
vp8: always update next_framep[] before returning from decode_frame().
avconv: estimate next_dts from framerate if it is set.
avconv: better next_dts usage.
avconv: rename InputStream.pts to last_dts.
avconv: reduce overloading for InputStream.pts.
avconv: rename InputStream.next_pts to next_dts.
avconv: rework -t handling for encoding.
avconv: set encoder timebase for subtitles.
pva-demux test: add -vn
swscale: K&R formatting cosmetics for SPARC code
apedec: allow the user to set the maximum number of output samples per call
apedec: do not unnecessarily zero output samples for mono frames
apedec: allocate a single flat buffer for decoded samples
apedec: use sizeof(field) instead of sizeof(type)
swscale: split C output functions into separate file.
swscale: Split C input functions into separate file.
bytestream: Add bytestream2 writing API.
The avconv changes are due to massive regressions and bugs not merged yet.
Conflicts:
ffmpeg.c
libavcodec/vp8.c
libswscale/swscale.c
libswscale/x86/swscale_template.c
tests/fate/demux.mak
tests/ref/lavf/asf
tests/ref/lavf/avi
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/lavf/rm
tests/ref/lavf/ts
tests/ref/seek/lavf_avi
tests/ref/seek/lavf_mkv
tests/ref/seek/lavf_rm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-08 05:53:35 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-02-08 05:53:35 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-13 16:22:25 +01:00
2012-01-10 03:50:41 +01:00
2012-01-24 02:41:53 +01:00
2012-01-13 01:29:48 +01:00
2012-02-01 04:43:06 +01:00
2012-01-24 02:41:53 +01:00
2012-01-10 03:50:41 +01:00
2012-01-24 02:41:53 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-21 05:29:47 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 02:24:09 +01:00
2012-01-28 20:13:38 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 22:53:59 +01:00
2012-02-01 02:36:09 +01:00
2012-02-01 02:36:09 +01:00
2012-01-03 16:28:17 -05:00
2012-01-05 02:03:12 +01:00
2012-01-28 20:14:20 +01:00
2012-01-14 01:17:06 +01:00
2012-02-07 01:40:29 +01:00
2012-02-05 20:43:33 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-06 02:45:12 +01:00
2012-02-08 05:53:35 +01:00
2012-01-30 23:28:26 +01:00
2012-01-30 23:28:36 +01:00
2012-02-02 02:24:09 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-01-28 07:53:34 +01:00
2012-01-29 00:34:59 +01:00
2012-02-07 01:40:29 +01:00
2012-01-14 17:23:57 +01:00
2012-02-03 03:51:32 +01:00
2012-01-09 00:32:38 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 16:32:55 +01:00
2012-01-11 21:29:25 +01:00
2012-02-08 05:53:35 +01:00
2012-01-14 04:51:13 +01:00
2012-01-14 04:47:27 +01:00
2012-01-14 02:22:09 +01:00
2012-01-08 03:34:22 +01:00
2012-01-08 03:34:22 +01:00
2012-01-22 23:40:24 +01:00
2012-01-29 00:34:59 +01:00
2012-01-08 00:18:36 +01:00
2012-02-02 20:44:22 +01:00
2012-01-04 01:12:34 +01:00
2012-01-28 21:59:01 +01:00
2012-02-02 01:12:46 +01:00
2012-02-06 20:59:59 +01:00
2012-02-07 22:02:40 +01:00
2012-01-26 17:05:57 +01:00
2012-01-14 01:15:42 +01:00
2012-01-17 01:37:59 +01:00
2012-02-04 02:34:14 +01:00
2012-01-29 08:11:18 -08:00
2012-01-29 14:52:56 +01:00
2012-01-29 00:34:59 +01:00
2012-02-05 02:08:03 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 22:01:05 +01:00
2012-02-02 02:24:09 +01:00
2012-01-24 21:08:41 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-06 21:03:24 +01:00
2012-02-07 01:40:29 +01:00
2012-01-29 00:34:59 +01:00
2012-01-07 02:30:27 +01:00
2012-02-01 14:37:47 -05:00
2012-02-02 18:44:52 +01:00
2012-01-15 01:16:54 +01:00
2012-01-07 13:38:23 -05:00
2012-01-28 07:53:34 +01:00
2012-02-02 02:24:09 +01:00
2012-01-11 08:56:24 -05:00
2012-02-01 04:43:06 +01:00
2012-01-12 01:10:32 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-25 06:48:30 +01:00
2012-01-14 02:22:09 +01:00
2012-01-29 00:34:59 +01:00
2012-01-15 01:16:54 +01:00
2012-01-29 00:34:59 +01:00
2012-01-07 02:30:27 +01:00
2012-01-26 19:54:38 +01:00
2012-02-01 02:36:09 +01:00
2012-01-30 18:39:08 +01:00
2012-01-29 00:34:59 +01:00
2012-01-15 14:13:25 +01:00
2012-01-30 11:24:02 +01:00
2012-01-25 18:55:32 +01:00
2012-01-12 13:54:41 +01:00
2012-01-12 13:54:41 +01:00
2012-01-26 02:23:56 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-01-08 03:34:22 +01:00
2012-01-08 03:34:22 +01:00
2012-01-13 19:51:19 +01:00
2012-01-12 16:32:55 +01:00
2012-02-06 19:39:24 +01:00
2012-01-08 00:18:36 +01:00
2012-01-29 00:34:59 +01:00
2012-01-30 10:16:23 -08:00
2012-01-31 02:46:26 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 07:26:31 +01:00
2012-01-08 03:34:22 +01:00
2012-01-25 03:51:49 +01:00
2012-01-28 23:21:03 +01:00
2012-01-28 22:08:20 +01:00
2012-01-28 22:08:20 +01:00
2012-02-01 15:51:18 +01:00
2012-01-19 23:31:22 +01:00
2012-01-08 03:34:22 +01:00
2012-01-28 07:53:34 +01:00
2012-02-07 18:28:00 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 18:11:40 +01:00
2012-02-03 03:51:32 +01:00
2012-01-29 00:34:59 +01:00
2012-02-04 05:18:45 +01:00
2012-01-08 03:34:22 +01:00
2012-02-07 01:40:29 +01:00
2012-02-07 01:40:29 +01:00
2012-01-29 00:34:59 +01:00
2012-02-05 20:43:33 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-18 22:04:14 +01:00
2012-01-07 00:11:43 +01:00
2012-01-28 07:53:34 +01:00
2012-02-01 14:37:47 -05:00
2012-01-06 00:51:31 +01:00
2012-01-12 16:32:55 +01:00
2012-01-29 00:34:59 +01:00
2012-01-26 02:23:56 +01:00
2012-02-03 03:51:32 +01:00
2012-02-03 03:51:32 +01:00
2012-01-07 02:30:27 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 14:31:17 +01:00
2012-01-31 02:46:26 +01:00
2012-02-02 14:31:17 +01:00
2012-01-28 07:53:34 +01:00
2012-02-05 01:34:59 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-01-10 03:50:41 +01:00
2012-01-21 23:11:27 +01:00
2012-01-28 07:53:34 +01:00
2012-01-31 21:43:04 +01:00
2012-02-02 14:31:17 +01:00
2012-01-12 01:10:32 +01:00
2012-01-12 01:10:32 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-01-27 17:19:09 -08:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-07 22:02:40 +01:00
2012-01-22 16:38:20 +01:00
2012-01-16 20:32:16 +01:00
2012-01-29 00:34:59 +01:00
2012-02-07 15:48:33 +01:00
2012-01-30 11:25:59 +01:00
2012-01-17 02:37:30 +01:00
2012-01-22 00:46:19 +01:00
2012-01-30 05:20:58 +01:00
2012-01-31 21:40:53 +01:00
2012-01-30 05:20:58 +01:00
2012-02-03 23:12:10 +01:00
2012-01-15 22:04:25 +01:00
2012-01-23 01:05:20 +01:00
2012-01-19 23:31:21 +01:00
2012-01-17 20:55:19 +01:00
2012-02-02 01:12:46 +01:00
2012-01-29 00:34:59 +01:00
2012-01-24 02:41:53 +01:00
2012-01-23 19:47:49 +01:00
2012-01-26 22:28:25 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 11:04:19 +01:00
2012-01-28 22:08:20 +01:00
2012-01-29 21:00:19 +01:00
2012-02-03 03:51:32 +01:00
2012-01-22 06:46:24 +01:00
2012-01-29 00:34:59 +01:00
2012-01-06 00:59:08 +01:00
2012-01-12 17:02:13 +01:00
2012-01-28 23:21:03 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 22:08:21 +01:00
2012-01-26 02:23:56 +01:00
2012-01-11 02:44:43 +01:00
2012-01-17 02:37:30 +01:00
2012-01-11 02:44:43 +01:00
2012-01-13 01:29:48 +01:00
2012-01-16 19:26:41 +01:00
2012-01-16 19:26:41 +01:00
2012-01-11 02:44:43 +01:00
2012-01-29 00:34:59 +01:00
2012-01-28 14:56:18 +00:00
2012-01-28 14:56:18 +00:00
2012-01-29 00:34:59 +01:00
2012-01-19 23:31:22 +01:00
2012-02-01 04:43:06 +01:00
2012-01-05 22:24:51 +01:00
2012-01-29 00:34:59 +01:00
2012-01-29 00:34:59 +01:00
2012-02-01 04:43:06 +01:00
2012-01-26 20:05:15 +01:00
2012-01-30 05:20:58 +01:00
2012-01-28 01:36:42 +01:00
2012-01-22 04:49:46 +01:00
2012-01-11 11:15:05 +01:00
2012-01-28 07:53:34 +01:00
2012-02-02 14:31:17 +01:00
2012-02-02 14:31:17 +01:00
2012-01-18 22:04:14 +01:00
2012-02-02 02:24:09 +01:00
2012-01-29 00:34:59 +01:00
2012-01-18 02:08:12 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-02-07 00:46:01 +01:00
2012-02-06 08:00:31 +01:00
2012-02-07 01:40:29 +01:00
2012-01-28 22:08:21 +01:00
2012-01-04 19:45:46 +01:00
2012-01-04 19:45:46 +01:00
2012-02-06 00:29:32 +01:00
2012-02-06 00:29:32 +01:00
2012-01-12 18:18:23 +01:00
2012-01-12 18:18:23 +01:00
2012-01-29 00:34:59 +01:00
2012-01-12 18:18:23 +01:00
2012-01-07 02:30:27 +01:00
2012-01-27 02:09:58 +01:00
2012-02-02 02:24:09 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-01-08 20:22:12 +01:00
2012-02-05 20:43:33 +01:00
2012-01-29 00:34:59 +01:00
2012-02-03 03:51:32 +01:00
2012-02-03 03:51:32 +01:00
2012-01-25 21:12:00 +01:00
2012-02-08 05:53:35 +01:00
2012-02-07 01:40:29 +01:00
2012-01-08 03:34:22 +01:00
2012-01-05 22:24:51 +01:00
2012-01-29 17:50:17 +01:00
2012-01-29 00:34:59 +01:00
2012-01-31 02:46:26 +01:00
2012-02-01 02:36:09 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-23 19:04:35 +01:00
2012-01-29 00:34:59 +01:00
2012-01-03 23:05:54 +01:00
2012-01-04 19:45:46 +01:00
2012-01-04 19:45:46 +01:00
2012-02-04 01:12:04 +01:00
2012-02-02 02:24:09 +01:00
18d0a16fc9