1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavutil
Michael Niedermayer 8e576d5830 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libavutil: add utility functions to simplify allocation of audio buffers.
  libavutil: add planar sample formats and av_sample_fmt_is_planar()
  avconv: fix segfault at EOF with delayed pictures
  pcmdec: remove unneeded resetting of samples pointer
  avconv: remove a now unused parameter from output_packet().
  avconv: formatting fixes in output_packet()
  avconv: declare some variables in blocks where they are used
  avconv: use the same behavior when decoding audio/video/subs
  bethsoftvideo: return proper consumed size for palette packets.
  cdg: skip packets that don't contain a cdg command.
  crcenc: add flags
  avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
  tiffenc: add a private option for selecting compression algorithm
  md5enc: add flags
  ARM: remove needless .text/.align directives

Conflicts:
	doc/APIchanges
	libavcodec/tiffenc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libavutil/samplefmt.h
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cdgraphics
	tests/ref/fate/film-cvid-pcm-stereo-8bit
	tests/ref/fate/mpeg2-field-enc
	tests/ref/fate/nuv
	tests/ref/fate/tiertex-seq
	tests/ref/fate/tscc-32bit
	tests/ref/fate/vmnc-32bit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 03:32:24 +01:00
..
arm
avr32
bfin
mips
ppc
sh4
tomi
x86 Fix compilation with YASM. 2011-11-20 15:03:32 +01:00
adler32.c
adler32.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
aes.c Merge remote-tracking branch 'qatar/master' 2011-11-11 02:50:35 +01:00
aes.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
attributes.h avutil: add av_noreturn 2011-11-11 04:24:00 +01:00
audioconvert.c audioconvert: make av_get_channel_layout accept composite names. 2011-11-09 21:03:47 +01:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
avassert.h
avstring.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
avstring.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
avutil.h Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
base64.c
base64.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
bswap.h
colorspace.h
common.h
cpu.c
cpu.h
crc_data.h
crc.c
crc.h
des.c
des.h
dict.c Merge remote-tracking branch 'qatar/master' 2011-11-07 03:01:43 +01:00
dict.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
error.c
error.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
eval.c
eval.h
fifo.c
fifo.h
file.c
file.h
imgutils.c Merge remote-tracking branch 'qatar/master' 2011-11-20 02:46:06 +01:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
integer.c
integer.h
internal.h avutil: Don't allow using strcasecmp/strncasecmp 2011-11-06 11:52:59 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h Check for cbrtf() and provide fallback 2011-10-22 19:49:27 +02:00
lls.c
lls.h
log.c Merge remote-tracking branch 'qatar/master' 2011-11-03 02:16:26 +01:00
log.h
lzo.c av_lzo1x_decode: properly handle negative buffer length. 2011-11-05 23:25:20 +01:00
lzo.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
Makefile
mathematics.c
mathematics.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
md5.c
md5.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
mem.c
mem.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
opt.c avopts: Fix random values being printed in error messages: 2011-11-20 15:02:36 +01:00
opt.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
parseutils.c Merge remote-tracking branch 'qatar/master' 2011-11-17 02:44:33 +01:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-11-17 02:44:33 +01:00
pca.c
pca.h
pixdesc.c Merge remote-tracking branch 'qatar/master' 2011-11-15 03:13:42 +01:00
pixdesc.h
pixfmt.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
random_seed.c
random_seed.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rational.c
rational.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
rc4.c
rc4.h
samplefmt.c Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2011-11-24 03:32:24 +01:00
sha.c
sha.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
softfloat.c
softfloat.h
timer.h
tree.c
tree.h Merge remote-tracking branch 'qatar/master' 2011-11-23 04:02:17 +01:00
utils.c
x86_cpu.h