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-02-02 14:31:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2012-03-05 13:08:17 -05:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2012-02-11 16:41:01 -05:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2010-07-20 10:09:54 +00:00
2011-05-02 18:38:01 +02:00
2011-05-02 18:38:01 +02:00
2011-05-02 18:38:01 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-11-02 10:43:39 +01:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2012-04-05 06:03:10 +02:00
2010-07-20 10:09:54 +00:00
2012-02-07 20:11:11 +01:00
2012-04-20 10:23:57 -04:00
2012-03-22 00:40:11 +01:00
2011-12-12 21:54:52 +01:00
2011-07-08 19:58:19 +02:00
2010-07-20 10:09:54 +00:00
2012-04-24 02:30:41 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2012-03-22 00:40:11 +01:00
2012-01-22 14:40:53 +01:00
2012-01-22 14:40:53 +01:00
2011-12-12 21:54:52 +01:00
2011-12-12 21:54:52 +01:00
2012-03-22 00:40:11 +01:00
2010-07-20 10:09:54 +00:00
2012-03-22 00:40:11 +01:00
2010-07-20 10:09:54 +00:00
2012-03-03 17:03:27 -05:00
2011-10-14 13:28:58 +02:00
2012-03-22 00:40:11 +01:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2012-03-03 17:03:26 -05:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2012-02-26 07:30:21 +01:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2011-10-14 13:28:58 +02:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-09-26 09:02:51 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00
2010-07-20 10:09:54 +00:00