1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavutil
Michael Niedermayer ab8cfd45f8 Merge remote branch 'qatar/master'
* qatar/master:
  avio: add more documentation for AVIOContext.
  Parse sprite data for WMVP and WVP2, and decode sprites for the latter
  Replace outdated info on the FAQ
  Redefine sameq
  pad: fix example explanation
  gradfun: add notice from the MPlayer manual
  eval: add support for trunc, ceil, and floor functions
  documentation: add setdar and setsar description to filters.texi
  avio: document some members of AVIOContext.
  avio: document avio_close().
  avio: cosmetics, vertically align comments.
  avio: cosmetics, group the reading functions.
  avio: cosmetics, merge all the FF_API_OLD_AVIO blocks.
  avio: cosmetics, move AVIOContext to start of the file.
  avio: update file header.
  os: fix OpenBSD/PowerPC compilation
  pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE
  oggdec: fix demuxing chained audio streams
  fix typo

Conflicts:
	doc/filters.texi
	libavformat/avio.h
	libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-11 04:08:08 +02:00
..
arm Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avr32 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
bfin Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mips Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ppc Merge remote branch 'qatar/master' 2011-04-11 04:08:08 +02:00
sh4 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tomi Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86 Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
adler32.c Replace many includes of libavutil/common.h with what is actually needed 2010-03-09 17:39:19 +00:00
adler32.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
aes.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
aes.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
attributes.h Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
audioconvert.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
audioconvert.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avassert.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avstring.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avstring.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avutil.h eval: add support for trunc, ceil, and floor functions 2011-04-10 09:24:21 +02:00
base64.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
base64.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
bswap.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
colorspace.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
common.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
cpu.c Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
cpu.h Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
crc_data.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
crc.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
crc.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
des.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
des.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
error.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
error.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
eval.c eval: add support for trunc, ceil, and floor functions 2011-04-10 09:24:21 +02:00
eval.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fifo.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fifo.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
file.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
file.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
imgutils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
imgutils.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
integer.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
integer.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
internal.h Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
intfloat_readwrite.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intfloat_readwrite.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intmath.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
intreadwrite.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
inverse.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lfg.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lfg.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavutil.v
libm.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lls.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lls.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
log.c Fix apparently exploitable race condition. 2011-03-25 02:24:32 +01:00
log.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lzo.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
lzo.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
Makefile Install libavutil/{aes,sha}.h 2011-04-07 17:54:52 +02:00
mathematics.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mathematics.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
md5.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
md5.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mem.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mem.h Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
opt.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
opt.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
parseutils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
parseutils.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pca.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pca.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pixdesc.c Add pixel formats for 9- and 10-bit yuv420p. 2011-04-10 22:33:41 +02:00
pixdesc.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
pixfmt.h Add pixel formats for 9- and 10-bit yuv420p. 2011-04-10 22:33:41 +02:00
random_seed.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
random_seed.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rational.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rational.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rc4.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rc4.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
samplefmt.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
samplefmt.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
sha1.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
sha.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
sha.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
softfloat.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
softfloat.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
timer.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tree.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
tree.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
utils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x86_cpu.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00