ffmpeg/libavcodec/x86
Michael Niedermayer 52b6d96268 Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42'
* commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42':
  x86: bswapdsp: Don't treat 32-bit integers as 64-bit

Conflicts:
	libavcodec/x86/bswapdsp.asm

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17 23:20:14 +02:00
..
Makefile Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed' 2015-07-17 22:45:34 +02:00
ac3dsp.asm
ac3dsp_init.c
audiodsp.asm
audiodsp_init.c
blockdsp.asm
blockdsp_init.c
bswapdsp.asm Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42' 2015-07-17 23:20:14 +02:00
bswapdsp_init.c
cabac.h
cavsdsp.c
constants.c
constants.h
dcadsp.asm
dcadsp_init.c
dct-test.c
dct32.asm
dct_init.c
deinterlace.asm
dirac_dwt.c
dirac_dwt.h
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc.asm
dnxhdenc_init.c
dwt_yasm.asm
fdct.c
fdct.h
fdctdsp_init.c
fft.asm
fft.h
fft_init.c
flac_dsp_gpl.asm
flacdsp.asm
flacdsp_init.c
fmtconvert.asm
fmtconvert_init.c
fpel.asm
fpel.h
g722dsp.asm
g722dsp_init.c
h263_loopfilter.asm
h263dsp_init.c
h264_chromamc.asm
h264_chromamc_10bit.asm
h264_deblock.asm
h264_deblock_10bit.asm
h264_i386.h
h264_idct.asm
h264_idct_10bit.asm
h264_intrapred.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_qpel.c
h264_qpel_8bit.asm
h264_qpel_10bit.asm
h264_weight.asm
h264_weight_10bit.asm
h264chroma_init.c
h264dsp_init.c
hevc_deblock.asm
hevc_idct.asm
hevc_mc.asm
hevc_res_add.asm
hevc_sao.asm
hevcdsp.h
hevcdsp_init.c
hpeldsp.asm
hpeldsp.h
hpeldsp_init.c
hpeldsp_rnd_template.c
huffyuvdsp.asm
huffyuvdsp_init.c
huffyuvencdsp_mmx.c
idctdsp.asm
idctdsp.h
idctdsp_init.c
imdct36.asm
inline_asm.h
jpeg2000dsp.asm
jpeg2000dsp_init.c
lossless_audiodsp.asm
lossless_audiodsp_init.c
lossless_videodsp.asm
lossless_videodsp_init.c
lpc.c
mathops.h
me_cmp.asm
me_cmp_init.c
mlpdsp.asm
mlpdsp_init.c
mpegaudiodsp.c
mpegvideo.c
mpegvideodsp.c
mpegvideoenc.c
mpegvideoenc_qns_template.c
mpegvideoenc_template.c
mpegvideoencdsp.asm
mpegvideoencdsp_init.c
pixblockdsp.asm
pixblockdsp_init.c
pngdsp.asm
pngdsp_init.c
proresdsp.asm
proresdsp_init.c
qpel.asm
qpeldsp.asm
qpeldsp_init.c
rnd_template.c
rv34dsp.asm
rv34dsp_init.c
rv40dsp.asm
rv40dsp_init.c
sbrdsp.asm
sbrdsp_init.c
simple_idct.c
simple_idct.h
snowdsp.c
svq1enc.asm
svq1enc_init.c
ttadsp.asm
ttadsp_init.c
v210-init.c
v210.asm
v210enc.asm
v210enc_init.c
vc1dsp.asm
vc1dsp.h
vc1dsp_init.c
vc1dsp_mmx.c
videodsp.asm
videodsp_init.c
vorbisdsp.asm
vorbisdsp_init.c
vp3dsp.asm
vp3dsp_init.c
vp6dsp.asm
vp6dsp_init.c
vp8dsp.asm
vp8dsp_init.c
vp8dsp_loopfilter.asm
vp9dsp_init.c
vp9intrapred.asm
vp9itxfm.asm
vp9lpf.asm
vp9mc.asm
vp56_arith.h
w64xmmtest.c
xvididct.asm
xvididct.h
xvididct_init.c