ffmpeg/libavcodec/x86
Michael Niedermayer 7a72695c05 Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 22:45:46 +02:00
..
ac3dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +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-06-25 16:55:31 +02:00
cavsdsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
dct32_sse.asm Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhd_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
dsputil_mmx.h Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
dsputilenc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
dsputilenc_yasm.asm
dwt_yasm.asm
dwt.c dwt: Fix several warnings about incompatible pointer type 2012-07-27 19:36:17 +02:00
dwt.h
fdct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
fft.c Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
fft.h Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
h264_chromamc_10bit.asm h264_chromamc_10bit: port x86 simd to cpuflags. 2012-07-27 17:35:49 -07:00
h264_chromamc.asm
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +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-06-25 16:55:31 +02:00
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +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-07-07 20:29:43 +02:00
h264_qpel_10bit.asm
h264_qpel_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
h264_weight_10bit.asm
h264_weight.asm
h264dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
idct_mmx_xvid.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
idct_mmx.c x86: remove libmpeg2 mmx(ext) idct functions 2012-08-02 12:14:52 +01:00
idct_sse2_xvid.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
idct_xvid.h
imdct36_sse.asm
lpc_mmx.c Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
Makefile fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64. 2012-08-02 22:14:40 +02:00
mathops.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
mlpdsp.c
motion_est_mmx.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
mpegvideo_mmx_template.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
mpegvideo_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
pngdsp-init.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
pngdsp.asm
proresdsp-init.c
proresdsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-03 23:13:06 +02:00
rv34dsp_init.c x86: build: replace mmx2 by mmxext 2012-08-03 22:51:05 +02:00
rv34dsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
rv40dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
rv40dsp.asm
sbrdsp_init.c
sbrdsp.asm
simple_idct_mmx.c Merge remote-tracking branch 'qatar/master' 2012-07-26 21:37:15 +02:00
snowdsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
v210-init.c
v210.asm
vc1dsp_mmx.c Merge remote-tracking branch 'qatar/master' 2012-08-04 23:51:43 +02:00
vc1dsp_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-06-30 22:44:18 +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-04 23:51:43 +02:00
vp8dsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-05 21:55:31 +02:00
vp56_arith.h
vp56dsp_init.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
vp56dsp.asm Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
w64xmmtest.c