ffmpeg/libswscale
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
..
bfin Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
ppc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
sparc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
x86 Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
colorspace-test.c
input.c Merge remote-tracking branch 'qatar/master' 2012-04-24 02:30:41 +02:00
libswscale.v
options.c
output.c sws: remove cliping in yuv2rgb code. 2012-04-15 23:38:42 +02:00
rgb2rgb.c
rgb2rgb.h
rgb2rgb_template.c
swscale-test.c
swscale.c Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
swscale.h
swscale_internal.h Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2012-04-04 01:14:45 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
yuv2rgb.c