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-16 15:27:39 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-07 22:41:37 +02:00
2012-04-06 22:52:01 +02:00
2012-04-24 02:30:41 +02:00
2012-04-16 22:13:11 +02:00
2012-04-19 22:52:34 +02:00
2012-04-06 22:52:01 +02:00
2012-04-19 21:23:52 +02:00
2012-04-04 20:39:33 +02:00
2012-04-06 19:19:59 +03:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-20 22:18:26 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-16 12:01:55 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 08:32:09 +02:00
2012-04-06 22:52:01 +02:00
2012-04-07 22:11:21 +02:00
2012-04-14 22:37:43 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-19 21:43:15 +02:00
2012-04-14 18:21:19 +02:00
2012-04-06 22:52:01 +02:00
2012-04-24 02:30:41 +02:00
2012-04-06 22:52:01 +02:00
2012-04-22 22:26:42 +02:00
2012-04-21 22:56:07 +02:00
2012-04-06 22:52:01 +02:00
2012-04-14 18:21:19 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-07 07:56:55 +02:00
2012-04-23 00:02:49 +03:00
2012-04-08 09:44:14 +02:00
2012-04-19 22:11:19 +02:00
2012-04-06 22:52:01 +02:00
2012-04-19 15:08:13 +02:00
2012-04-20 20:58:45 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 00:53:09 +02:00
2012-04-19 21:23:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-17 14:44:06 +02:00
2012-04-18 15:30:34 +02:00
2012-04-11 14:56:02 +02:00
2012-04-16 18:36:39 +02:00
2012-04-16 18:36:39 +02:00
2012-04-16 13:51:40 +02:00
2012-04-04 20:39:33 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-13 00:39:19 +02:00
2012-04-06 22:52:01 +02:00
2012-04-17 00:09:19 -04:00
2012-04-20 22:18:26 +02:00
2012-04-06 22:52:01 +02:00
2012-04-18 00:28:06 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-06 22:52:01 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-16 02:18:09 +02:00
2012-04-06 22:52:01 +02:00
2012-04-22 11:23:58 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-03 19:12:52 +02:00
2012-04-03 19:12:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-23 12:26:19 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-22 15:29:34 +02:00
2012-04-21 19:42:44 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
Michael Niedermayer
3bbf3f7e42