Michael Niedermayer
3bbf3f7e42
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
matroska: Clear prev_pkt between seeks.
avutil: change default buffer size alignment for sample buffer functions
audemux: Add a sanity check for the number of channels
Remove libdirac decoder.
matroska: Add incremental parsing of clusters.
avconv: fix off by one check in complex_filter
mpegts: Try seeking back even for nonseekable protocols
swscale: K&R formatting cosmetics (part III)
Conflicts:
configure
doc/general.texi
doc/platform.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdirac.h
libavcodec/libdiracdec.c
libavformat/au.c
libavformat/mpegts.c
libswscale/input.c
tests/ref/seek/lavf_mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-24 02:30:41 +02:00
2012-04-22 22:26:42 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-04-13 21:50:37 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2012-04-20 21:16:12 +02:00
2012-02-04 20:27:02 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 01:51:53 +01:00
2011-11-23 04:02:17 +01:00
2011-11-11 04:24:00 +01:00
2012-04-20 09:43:11 -04:00
2012-04-20 09:43:11 -04:00
2012-04-09 23:02:33 +02:00
2012-04-09 23:02:33 +02:00
2011-05-22 04:53:19 +02:00
2011-11-07 03:01:43 +01:00
2011-12-13 00:39:48 +01:00
2012-04-20 22:18:26 +02:00
2012-01-22 23:06:04 +01:00
2011-11-23 04:02:17 +01:00
2012-03-21 13:39:28 +01:00
2012-03-21 13:39:28 +01:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2012-02-22 15:35:44 +01:00
2012-04-22 22:26:42 +02:00
2012-04-22 22:26:42 +02:00
2011-03-19 13:33:20 +00:00
2011-12-05 00:11:57 +01:00
2012-01-29 00:34:59 +01:00
2012-04-02 21:23:56 +02:00
2011-09-21 21:25:43 +02:00
2011-11-07 03:01:43 +01:00
2012-03-20 00:03:19 +01:00
2012-02-26 05:11:21 +01:00
2012-04-15 17:58:33 +02:00
2012-04-01 11:01:08 +02:00
2011-12-12 01:25:37 +01:00
2011-12-23 00:18:36 +01:00
2011-08-30 10:03:13 +02:00
2012-01-28 07:53:34 +01:00
2011-10-16 21:51:28 +02:00
2012-04-13 18:40:17 +02:00
2011-11-23 04:02:17 +01:00
2011-06-28 13:14:46 +02:00
2011-06-28 13:14:46 +02:00
2011-12-13 00:39:48 +01:00
2012-01-29 00:34:59 +01:00
2011-12-12 01:25:37 +01:00
2011-12-11 18:47:19 +00:00
2011-11-23 04:02:17 +01:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2012-04-04 21:17:52 +02:00
2011-07-04 00:45:21 +02:00
2011-10-22 19:49:27 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2012-01-09 22:35:45 +01:00
2012-02-06 11:30:54 +01:00
2012-03-26 13:00:09 +02:00
2011-12-31 16:31:15 +01:00
2012-04-20 22:18:26 +02:00
2012-02-21 05:10:12 +01:00
2012-02-21 05:10:12 +01:00
2011-07-04 00:45:21 +02:00
2012-01-29 00:34:59 +01:00
2012-04-16 22:13:12 +02:00
2011-12-25 18:55:43 +01:00
2012-01-20 20:34:48 +01:00
2012-04-18 15:30:34 +02:00
2012-04-23 14:39:01 +02:00
2012-02-06 11:30:54 +01:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2012-04-09 17:21:35 +02:00
2012-03-21 19:01:39 +01:00
2012-01-28 01:30:41 +01:00
2012-02-23 23:44:38 +01:00
2011-11-23 04:02:17 +01:00
2012-03-26 13:00:09 +02:00
2011-11-23 04:02:17 +01:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2012-04-24 02:30:41 +02:00
2012-04-18 00:28:06 +02:00
2012-02-14 01:53:31 +01:00
2011-11-23 04:02:17 +01:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2012-02-03 00:56:27 +01:00
2012-02-02 14:30:28 +01:00
2012-01-06 02:45:12 +01:00
2012-02-09 18:37:58 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-12-22 03:01:17 +01:00
2011-03-19 13:33:20 +00:00
3bbf3f7e42