Michael Niedermayer faa1d4b134 Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0' ... * commit 'ab72eda15e98197cf148abc08574206cfde0d9b0': pixfmt: mark the reserved values Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-06-24 01:09:38 +02:00
..
aarch64
arm
avr32
bfin
mips
ppc
sh4
tomi
x86
adler32.c
adler32.h
aes.c
aes.h
atomic_gcc.h
atomic_suncc.h
atomic_win32.h
atomic.c
atomic.h
attributes.h
audio_fifo.c
audio_fifo.h
audioconvert.h
avassert.h
avstring.c
avstring.h
avutil.h
avutilres.rc
base64.c
base64.h
blowfish.c
blowfish.h
bprint.c
bprint.h
bswap.h
buffer_internal.h
buffer.c
buffer.h
channel_layout.c
channel_layout.h
colorspace.h
common.h
cpu_internal.h
cpu.c
cpu.h
crc.c
crc.h
des.c
des.h
dict.c
dict.h
display.c
display.h
downmix_info.c
downmix_info.h
dynarray.h
error.c
error.h
eval.c
eval.h
fifo.c
fifo.h
file_open.c
file.c
file.h
fixed_dsp.c
fixed_dsp.h
float_dsp.c
float_dsp.h
frame.c
frame.h
hash.c
hash.h
hmac.c
hmac.h
imgutils.c
imgutils.h
integer.c
integer.h
internal.h
intfloat_readwrite.c
intfloat_readwrite.h
intfloat.h
intmath.c
intmath.h
intreadwrite.h
lfg.c
lfg.h
libavutil.v
libm.h
lls1.c
lls1.h
lls2.c
lls2.h
log2_tab.c
log.c
log.h
lzo.c
lzo.h
macros.h
Makefile
mathematics.c
mathematics.h
md5.c
md5.h
mem.c
mem.h
murmur3.c
murmur3.h
old_pix_fmts.h
opencl_internal.c
opencl_internal.h
opencl.c
opencl.h
opt.c
opt.h
parseutils.c
parseutils.h
pca.c
pca.h
pixdesc.c
pixdesc.h
pixfmt.h	Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'	2014-06-24 01:09:38 +02:00
qsort.h
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
replaygain.h
ripemd.c
ripemd.h
samplefmt.c
samplefmt.h
sha512.c
sha512.h
sha.c
sha.h
softfloat.c
softfloat.h
stereo3d.c
stereo3d.h
threadmessage.c
threadmessage.h
time.c
time.h
timecode.c
timecode.h
timer.h
timestamp.h
tree.c
tree.h
utf8.c
utils.c
version.h	Merge commit 'ab72eda15e98197cf148abc08574206cfde0d9b0'	2014-06-24 01:09:38 +02:00
x86_cpu.h
xga_font_data.c
xga_font_data.h
xtea.c
xtea.h