ffmpeg/libavutil
Michael Niedermayer 244682dd08 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  log: Only include unistd.h if configure found it
  ape: create audio stream before reading tags.
  mov: make a length variable larger.
  image2: Add "start_number" private option to the demuxer
  image2: Add "start_number" private option to the muxer
  avconv: remove a forgotten debugging printf.
  avconv: use more descriptive names for hardcoded filters.
  avconv: remove redundant handling of async.
  doc/filters: fix typo.
  h264: use asm cabac reader under a generic condition

Conflicts:
	ffmpeg.c
	libavformat/img2dec.c
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-24 21:34:54 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
avr32
bfin
mips
ppc
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
Makefile lavu: split version info into version.h 2012-06-24 12:34:12 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audio_fifo.c
audio_fifo.h
audioconvert.c
audioconvert.h
avassert.h
avstring.c
avstring.h
avutil.h lavu: split version info into version.h 2012-06-24 12:34:12 +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-06-24 02:09:53 +02:00
cpu.h cpu.h: include version.h for LIBAVUTIL_VERSION_MAJOR 2012-06-24 12:34:12 +02:00
crc.c
crc.h
crc_data.h
des.c
des.h
dict.c
dict.h
error.c
error.h
eval.c
eval.h
fifo.c
fifo.h
file.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
file.h
float_dsp.c
float_dsp.h
imgutils.c
imgutils.h
integer.c
integer.h
internal.h
intfloat.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c Merge remote-tracking branch 'qatar/master' 2012-06-24 21:34:54 +02:00
log.h
lzo.c
lzo.h
mathematics.c
mathematics.h
md5.c
md5.h
mem.c
mem.h
opt.c
opt.h
parseutils.c
parseutils.h
pca.c
pca.h
pixdesc.c
pixdesc.h
pixfmt.h
qsort.h qsort: flip compare direction to match libc qsort() 2012-06-22 22:48:00 +02:00
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c
samplefmt.h
sha.c
sha.h
softfloat.c
softfloat.h
time.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
time.h Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
timecode.c
timecode.h
timer.h
timestamp.h
tree.c
tree.h
utils.c
version.h lavu: split version info into version.h 2012-06-24 12:34:12 +02:00
x86_cpu.h