Michael Niedermayer 4cf4da9dc5 Merge commit '5b4797a21db900b7d509660b7a4d49829089b004' ... * commit '5b4797a21db900b7d509660b7a4d49829089b004': avframe: add AV_FRAME_DATA_MATRIXENCODING side data type. Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-01-05 22:12:41 +01:00
..
arm	…
avr32	…
bfin	…
mips	…
ppc	…
sh4	…
tomi	…
x86	rename new lls code to lls2 to avoid conflict with the old which has a different ABI	2013-11-17 16:41:08 +01:00
Makefile	Merge remote-tracking branch 'qatar/master'	2013-12-30 11:23:32 +01:00
adler32.c	…
adler32.h	…
aes.c	…
aes.h	…
atomic.c	Merge remote-tracking branch 'qatar/master'	2013-12-20 13:16:56 +01:00
atomic.h	Merge remote-tracking branch 'qatar/master'	2013-12-20 13:16:56 +01:00
atomic_gcc.h	…
atomic_suncc.h	…
atomic_win32.h	…
attributes.h	Merge commit '5858a67f135a7395c548482c73cf3d39bcdd3022'	2013-11-03 12:38:13 +01:00
audio_fifo.c	…
audio_fifo.h	…
audioconvert.h	…
avassert.h	…
avstring.c	avutil/avstring: fix () position	2013-12-11 21:13:51 +01:00
avstring.h	avutil/avstring: add av_strnlen()	2013-12-22 22:25:15 +01:00
avutil.h	Merge remote-tracking branch 'qatar/master'	2013-12-30 11:23:32 +01:00
avutilres.rc	Add Windows resource file support for shared libraries	2013-12-05 23:42:07 +01:00
base64.c	…
base64.h	…
blowfish.c	…
blowfish.h	…
bprint.c	…
bprint.h	…
bswap.h	…
buffer.c	…
buffer.h	…
buffer_internal.h	…
channel_layout.c	Merge remote-tracking branch 'qatar/master'	2013-11-24 05:21:19 +01:00
channel_layout.h	Merge commit '5c437fb'	2014-01-05 21:55:58 +01:00
colorspace.h	…
common.h	Merge remote-tracking branch 'qatar/master'	2013-11-24 05:21:19 +01:00
cpu.c	Merge remote-tracking branch 'qatar/master'	2013-11-24 05:21:19 +01:00
cpu.h	…
cpu_internal.h	…
crc.c	…
crc.h	…
des.c	…
des.h	…
dict.c	…
dict.h	lavu/dict.h: extend/clarify av_dict_get() doxy	2013-12-16 18:30:04 +01:00
error.c	…
error.h	error.h: Do not circularly depend on avutil.h	2013-12-25 00:12:05 +01:00
eval.c	…
eval.h	…
fifo.c	…
fifo.h	…
file.c	…
file.h	…
file_open.c	avutil: add av_fopen_utf8()	2013-11-04 15:38:52 +01:00
float_dsp.c	…
float_dsp.h	…
frame.c	avutil/frame: increase padding for frames	2013-12-28 19:10:45 +01:00
frame.h	Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'	2014-01-05 22:12:41 +01:00
hash.c	…
hash.h	…
hmac.c	…
hmac.h	…
imgutils.c	…
imgutils.h	…
integer.c	…
integer.h	…
internal.h	Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'	2013-12-09 20:52:14 +01:00
intfloat.h	…
intfloat_readwrite.c	avutil: Remove deprecated intfloat_readwrite code	2013-12-16 17:51:00 +01:00
intfloat_readwrite.h	avutil: Remove deprecated intfloat_readwrite code	2013-12-16 17:51:00 +01:00
intmath.c	…
intmath.h	…
intreadwrite.h	…
lfg.c	…
lfg.h	…
libavutil.v	…
libm.h	…
lls1.c	avutil: reintroduce lls1 as the 52 ABI needs it	2013-11-17 16:44:32 +01:00
lls1.h	avutil: reintroduce lls1 as the 52 ABI needs it	2013-11-17 16:44:32 +01:00
lls2.c	rename new lls code to lls2 to avoid conflict with the old which has a different ABI	2013-11-17 16:41:08 +01:00
lls2.h	rename new lls code to lls2 to avoid conflict with the old which has a different ABI	2013-11-17 16:41:08 +01:00
log.c	avutil/log: skip IO calls on empty strings	2013-12-06 23:30:34 +01:00
log.h	…
log2_tab.c	…
lzo.c	…
lzo.h	…
macros.h	Merge remote-tracking branch 'qatar/master'	2013-12-30 11:23:32 +01:00
mathematics.c	avutil/mathematics: add av_add_stable()	2014-01-04 15:10:09 +01:00
mathematics.h	avutil/mathematics: add av_add_stable()	2014-01-04 15:10:09 +01:00
md5.c	…
md5.h	…
mem.c	Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'	2013-11-14 15:04:04 +01:00
mem.h	Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'	2013-11-14 15:04:04 +01:00
murmur3.c	…
murmur3.h	…
old_pix_fmts.h	Merge remote-tracking branch 'qatar/master'	2013-11-14 03:26:35 +01:00
opencl.c	cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices	2013-12-09 21:21:36 +01:00
opencl.h	cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices	2013-12-09 21:21:36 +01:00
opencl_internal.c	…
opencl_internal.h	…
opt.c	lavu,lavc,lswr: do not hardcode AV_SAMPLE_FMT_NB value when setting sample format max value	2013-12-26 11:35:27 +01:00
opt.h	…
parseutils.c	Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'	2013-12-12 19:12:33 +01:00
parseutils.h	…
pca.c	…
pca.h	…
pixdesc.c	Convert XvMC to hwaccel v3	2013-12-22 22:03:47 +01:00
pixdesc.h	…
pixfmt.h	Convert XvMC to hwaccel v3	2013-12-22 22:03:47 +01:00
qsort.h	…
random_seed.c	…
random_seed.h	…
rational.c	avutil/rational: av_add_stable() test code	2014-01-04 15:10:14 +01:00
rational.h	…
rc4.c	…
rc4.h	…
ripemd.c	…
ripemd.h	…
samplefmt.c	…
samplefmt.h	…
sha.c	…
sha.h	…
sha512.c	…
sha512.h	…
softfloat.c	…
softfloat.h	…
stereo3d.c	Merge commit '7e244c68600f479270e979258e389ed5240885fb'	2013-12-09 21:33:51 +01:00
stereo3d.h	Merge remote-tracking branch 'qatar/master'	2013-12-17 19:37:50 +01:00
time.c	…
time.h	…
timecode.c	…
timecode.h	…
timer.h	…
timestamp.h	…
tree.c	…
tree.h	…
utf8.c	avutil/utf8: put under #ifdef TEST	2013-11-22 17:16:11 +01:00
utils.c	Merge remote-tracking branch 'qatar/master'	2013-12-30 11:23:32 +01:00
version.h	Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'	2014-01-05 22:12:41 +01:00
x86_cpu.h	…
xga_font_data.c	…
xga_font_data.h	…
xtea.c	avutil/xtea: add Doxy @file and group	2013-11-03 00:59:38 +01:00
xtea.h	avutil/xtea: add Doxy @file and group	2013-11-03 00:59:38 +01:00