Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Apr 2012 22:19:55 +0000 (00:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Apr 2012 00:30:41 +0000 (02:30 +0200)
commit3bbf3f7e42247b7a8b34b1e8cc891b59e1327bb8
treebf3b0776b76e0f5c4c331d9d069f16e3c0236a9c
parent2e8f19d26f3ef7e804a7f9f9811e4b538e0a5969
parent7521c4bab28ff3a622171be5b39a6b210f4263f0
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>
configure
doc/general.texi
doc/platform.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavformat/au.c
libavformat/matroskadec.c
libavutil/samplefmt.c
libswscale/input.c
tests/ref/seek/lavf_mkv