1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
FFmpeg/libavutil
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
..
arm Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
avr32
bfin
mips
ppc Merge remote-tracking branch 'qatar/master' 2012-04-13 21:50:37 +02:00
sh4
tomi
x86 Fix compilation with NASM. 2012-04-20 21:16:12 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audio_fifo.c avutil: add audio fifo buffer 2012-04-20 09:43:11 -04:00
audio_fifo.h avutil: add audio fifo buffer 2012-04-20 09:43:11 -04:00
audioconvert.c Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +02:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2012-04-09 23:02:33 +02:00
avassert.h
avstring.c
avstring.h
avutil.h Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
base64.c
base64.h
bprint.c
bprint.h
bswap.h
colorspace.h
common.h
cpu.c Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
cpu.h Merge remote-tracking branch 'qatar/master' 2012-04-22 22:26:42 +02:00
crc_data.h
crc.c
crc.h
des.c des: Fix half a dozen warnings 2012-04-02 21:23:56 +02:00
des.h
dict.c
dict.h
error.c
error.h error: ensure error codes are signed negative ints. 2012-04-15 17:58:33 +02:00
eval.c The lt and lte functions were swapped. 2012-04-01 11:01:08 +02:00
eval.h
fifo.c
fifo.h
file.c
file.h
imgutils.c av_image_alloc: Align the width to 8 when align >= 8. 2012-04-13 18:40:17 +02:00
imgutils.h
integer.c
integer.h
internal.h
intfloat_readwrite.c
intfloat_readwrite.h
intfloat.h
intmath.h
intreadwrite.h
inverse.c
lfg.c Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h
lzo.c libavutil: Remove broken and pointless lzo test program. 2012-03-26 13:00:09 +02:00
lzo.h
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
mathematics.c
mathematics.h
md5.c
md5.h
mem.c mem.c: fix wrong comment. 2012-04-16 22:13:12 +02:00
mem.h
opt.c
opt.h AVoption doxy: clarify a few needs in relation to AVClass less structs. 2012-04-18 15:30:34 +02:00
parseutils.c parseutils: add av_parse_time() test. 2012-04-23 14:39:01 +02:00
parseutils.h
pca.c
pca.h
pixdesc.c Mark GRAY8 format as pseudo-paletted. 2012-04-09 17:21:35 +02:00
pixdesc.h pixdesc: put components always in the same order. 2012-03-21 19:01:39 +01:00
pixfmt.h
random_seed.c
random_seed.h
rational.c libavutil: Remove pointless rational test program. 2012-03-26 13:00:09 +02:00
rational.h
rc4.c
rc4.h
samplefmt.c Merge remote-tracking branch 'qatar/master' 2012-04-24 02:30:41 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2012-04-18 00:28:06 +02:00
sha.c
sha.h
softfloat.c
softfloat.h
timecode.c
timecode.h
timer.h
timestamp.h
tree.c
tree.h
utils.c
x86_cpu.h