ffmpeg/libavutil
Michael Niedermayer 0ed023275f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: don't touch H264Context->ref_count[] during MB decoding
  x86: get_cpu_flags: add necessary ifdefs around function body
  x86: Drop CPU detection intrinsics
  x86: Add YASM implementations of cpuid and xgetbv from x264

Conflicts:
	configure
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-05 17:04:15 +02:00
..
arm Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
avr32
bfin
mips
ppc
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-10-05 17:04:15 +02:00
Makefile
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audio_fifo.c
audio_fifo.h
audioconvert.c
audioconvert.h
avassert.h
avstring.c
avstring.h
avutil.h
base64.c
base64.h
blowfish.c Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a' 2012-10-04 12:30:25 +02:00
blowfish.h
bprint.c
bprint.h
bswap.h
colorspace.h
common.h
cpu.c
cpu.h
crc.c
crc.h
crc_data.h
des.c
des.h
dict.c
dict.h
error.c
error.h
eval.c
eval.h
fifo.c
fifo.h
file.c
file.h
float_dsp.c
float_dsp.h
imgutils.c
imgutils.h
integer.c
integer.h
internal.h Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a' 2012-10-04 12:30:25 +02:00
intfloat.h
intfloat_readwrite.c
intfloat_readwrite.h
intmath.h
intreadwrite.h
inverse.c
lfg.c
lfg.h
libavutil.v
libm.h
lls.c
lls.h
log.c
log.h
lzo.c
lzo.h
mathematics.c
mathematics.h
md5.c
md5.h
mem.c
mem.h
opt.c
opt.h
parseutils.c
parseutils.h
pca.c
pca.h
pixdesc.c
pixdesc.h
pixfmt.h
qsort.h
random_seed.c
random_seed.h
rational.c
rational.h
rc4.c
rc4.h
samplefmt.c Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
samplefmt.h Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
sha.c
sha.h
softfloat.c
softfloat.h
time.c
time.h
timecode.c
timecode.h
timer.h
timestamp.h
tree.c
tree.h
utils.c
version.h Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
x86_cpu.h
xga_font_data.c
xga_font_data.h
xtea.c Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a' 2012-10-04 12:30:25 +02:00
xtea.h