ffmpeg/libavutil
Michael Niedermayer f9ecb849ef Merge remote-tracking branch 'qatar/master'
* qatar/master:
  crypto: Use av_freep instead of av_free
  lavf: don't try to free private options if priv_data is NULL.
  swscale: fix types of assembly arguments.
  swscale: move two macros that are only used once into caller.
  swscale: remove unused function.
  options: Add missing braces around struct initializer.
  mov: Remove leftover crufty debug statement with references to a local file.
  dvbsubdec: Fix compilation of debug code.
  Remove all uses of now deprecated metadata functions.
  Move metadata API from lavf to lavu.

Conflicts:
	doc/APIchanges
	libavformat/aiffdec.c
	libavformat/asfdec.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/cafdec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/wtv.c
	libavutil/avutil.h
	libavutil/internal.h
	libswscale/swscale.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-09 04:47:19 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2011-05-31 02:08:20 +02:00
avr32
bfin
mips
ppc Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
sh4
tomi
x86
Makefile Move metadata API from lavf to lavu. 2011-06-08 07:43:45 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audioconvert.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
audioconvert.h
avassert.h Merge remote-tracking branch 'qatar/master' 2011-05-22 04:53:19 +02:00
avstring.c
avstring.h
avutil.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
base64.c
base64.h
bswap.h bswap.h: Remove disabled code. 2011-04-29 20:01:04 +02:00
colorspace.h
common.h Merge remote branch 'qatar/master' 2011-05-14 02:19:58 +02:00
cpu.c cpudetect: add av_force_cpu_flags() 2011-06-02 21:03:54 +02:00
cpu.h cpudetect: add av_force_cpu_flags() 2011-06-02 21:03:54 +02:00
crc.c
crc.h
crc_data.h
des.c
des.h
dict.c Move metadata API from lavf to lavu. 2011-06-08 07:43:45 +02:00
dict.h Move metadata API from lavf to lavu. 2011-06-08 07:43:45 +02:00
error.c error.c: fix compile flags 2011-05-30 03:11:54 +02:00
error.h
eval.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
eval.h
fifo.c fifo: use av_freep() 2011-05-09 21:23:45 +02:00
fifo.h
file.c Fix error check in av_file_map() 2011-06-04 17:03:25 +01:00
file.h
imgutils.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
imgutils.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
integer.c
integer.h
internal.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
log.h Check syntax even if DEBUG is not defined. 2011-05-11 12:26:25 +02:00
lzo.c
lzo.h
mathematics.c av_compare_ts: Improve speed when calculations fit in 64bit. 2011-05-11 20:41:19 +02:00
mathematics.h
md5.c
md5.h
mem.c mem: Trying to workaround posix_memalign() bug on OSX 2011-06-07 03:17:42 +02:00
mem.h Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
opt.c Merge remote-tracking branch 'qatar/master' 2011-06-06 03:33:58 +02:00
opt.h Merge remote-tracking branch 'qatar/master' 2011-06-06 03:33:58 +02:00
parseutils.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
parseutils.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
pca.c
pca.h
pixdesc.c lavu: add av_get_pix_fmt_name() convenience function 2011-05-28 18:25:40 +02:00
pixdesc.h pixdesc: remove duplicated header inclusion 2011-06-06 11:34:45 +02:00
pixfmt.h pixfmt-Comment: Fix big/little typo 2011-05-12 20:07:39 +02:00
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
samplefmt.h Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
sha.c
sha.h
softfloat.c Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
softfloat.h Remove unused softfloat implementation. 2011-05-11 13:43:30 +02:00
timer.h
tree.c
tree.h
utils.c
x86_cpu.h