FFmpeg/libavcodec/x86
Michael Niedermayer 1c66807636 Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'
* commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112':
  configure: support Bitrig OS
  yuv2rgb: handle line widths that are not a multiple of 4.
  graph2dot: Use the fallback getopt implementation if needed
  tools: Include io.h for open/read/write/close if unistd.h doesn't exist
  testprogs: Remove unused includes
  qt-faststart: Use other seek/tell functions on MSVC than on mingw
  ismindex: Include direct.h for _mkdir on windows
  sdp: Use static const char arrays instead of pointers to strings
  x86: avcodec: Drop silly "_mmx" suffixes from filenames
  x86: avcodec: Drop silly "_sse" suffixes from filenames
  sdp: Include profile-level-id for H264
  utvideoenc: use ff_huff_gen_len_table
  huffman: add ff_huff_gen_len_table
  cllc: simplify/fix swapped data buffer allocation.
  rtpdec_h264: Don't set the pixel format
  h264: Check that the codec isn't null before accessing it
  audio_frame_queue: Define af_queue_log_state before using it

Conflicts:
	libavcodec/audio_frame_queue.c
	libavcodec/h264.c
	libavcodec/huffman.h
	libavcodec/huffyuv.c
	libavcodec/utvideoenc.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-29 18:04:34 +02:00
..
ac3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
cabac.h Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
cavsdsp.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
dct32.asm Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
deinterlace.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhdenc.c Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
dsputil_mmx.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
dsputil.asm Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
dsputilenc.asm Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
dwt_yasm.asm
dwt.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
dwt.h
fdct.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
fft_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
fft.asm Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
fft.h Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
fmtconvert_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_chromamc_10bit.asm x86: add colons after labels 2012-08-07 15:20:56 +01:00
h264_chromamc.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_deblock.asm Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
h264_i386.h Merge remote-tracking branch 'qatar/master' 2012-08-14 15:34:39 +02:00
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_intrapred_10bit.asm
h264_intrapred_init.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264_qpel_10bit.asm x86: add colons after labels 2012-08-07 15:20:56 +01:00
h264_qpel.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
h264_weight_10bit.asm x86: add colons after labels 2012-08-07 15:20:56 +01:00
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
h264dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-15 15:55:24 +02:00
idct_mmx_xvid.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
idct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
idct_sse2_xvid.c idct_sse2_xvid: remove libavutil/internal.h include 2012-08-16 17:26:06 +02:00
idct_xvid.h
imdct36.asm Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
lpc.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
Makefile Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
mathops.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
mlpdsp.c x86/mlpdsp: remove libavutil/internal.h include 2012-08-16 17:28:13 +02:00
motion_est.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
mpegaudiodec.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
mpegvideo.c Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
mpegvideoenc_template.c Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
mpegvideoenc.c Merge commit 'a1bcc76e6036e78f25cbb7323c145056cfca9d93' 2012-08-24 14:30:40 +02:00
pngdsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
pngdsp.asm x86: pngdsp: Fix assembly for OS/2 2012-08-08 15:45:09 +02:00
proresdsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
proresdsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
rv34dsp_init.c x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h 2012-08-09 00:58:20 +01:00
rv34dsp.asm x86: use 32-bit source registers with movd instruction 2012-08-07 15:21:20 +01:00
rv40dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
rv40dsp.asm x86: use 32-bit source registers with movd instruction 2012-08-07 15:21:20 +01:00
sbrdsp_init.c
sbrdsp.asm
simple_idct.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
snowdsp.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
v210-init.c
v210.asm
vc1dsp_mmx.c vc1dsp_mmx: remove libavutil/internal.h include 2012-08-16 17:29:29 +02:00
vc1dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
vp3dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
vp3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
vp8dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
vp56_arith.h
vp56dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
vp56dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
w64xmmtest.c