1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer b18e17eabf Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
  utils: Check for extradata size overflows.
  ARM: rv34: fix asm syntax in dc transform functions
  avio: Fix the value of the deprecated URL_FLAG_NONBLOCK
  rv34: fix and optimise frame dependency checking
  rv34: NEON optimised dc only inverse transform
  avprobe: use avio_size() instead of deprecated AVFormatContext.file_size.
  ffmenc: remove references to deprecated AVFormatContext.timestamp.
  lavf: undeprecate read_seek().
  avserver: remove code using deprecated CODEC_CAP_PARSE_ONLY.
  lavc: replace some remaining FF_I_TYPE with AV_PICTURE_TYPE_I
  lavc: ifdef out parse_only AVOption
  nellymoserdec: SAMPLE_FMT -> AV_SAMPLE_FMT
  mpegvideo_enc: ifdef out/replace references to deprecated codec flags.
  riff: remove references to sonic codec ids
  indeo4: add some missing static and const qualifiers
  rv34: DC-only inverse transform
  avconv: use AVFrame.width/height/format instead of corresponding AVCodecContext fields
  lavfi: move version macros to a new installed header version.h
  vsrc_buffer: release the buffer on uninit.
  rgb2rgb: rgb12tobgr12()
  ...

Conflicts:
	avconv.c
	doc/APIchanges
	ffprobe.c
	libavfilter/Makefile
	libavfilter/avfilter.h
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-13 01:29:48 +01:00
..
ac3dsp_mmx.c
ac3dsp.asm
cabac.h cabac: Try to disable problematic ASM for gcc-llvm 4.2.1 2012-01-11 22:30:21 +01:00
cavsdsp_mmx.c
dct32_sse.asm
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm
dnxhd_mmx.c
dsputil_mmx_avg_template.c
dsputil_mmx_qns_template.c
dsputil_mmx_rnd_template.c
dsputil_mmx.c Merge remote-tracking branch 'qatar/master' 2011-12-14 23:58:10 +01:00
dsputil_mmx.h
dsputil_yasm.asm
dsputilenc_mmx.c
dsputilenc_yasm.asm
dwt_yasm.asm
dwt.c
dwt.h
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c
fmtconvert.asm
h264_chromamc_10bit.asm
h264_chromamc.asm
h264_deblock_10bit.asm
h264_deblock.asm
h264_i386.h Revert "Revert commit 599b4c6efddaed33b1667c386b34b07729ba732b" 2012-01-09 03:32:06 +01:00
h264_idct_10bit.asm
h264_idct.asm
h264_intrapred_10bit.asm
h264_intrapred_init.c
h264_intrapred.asm
h264_qpel_10bit.asm
h264_qpel_mmx.c
h264_weight_10bit.asm
h264_weight.asm
h264dsp_mmx.c
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm Fix compilation with yasm-0.6.2 2012-01-12 16:35:49 +01:00
lpc_mmx.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
mpegvideo_mmx_template.c
mpegvideo_mmx.c
png_mmx.c
proresdsp-init.c
proresdsp.asm Fix compilation with yasm-0.6.2 2012-01-12 16:35:49 +01:00
rv34dsp_init.c rv34: DC-only inverse transform 2012-01-12 09:52:33 +01:00
rv34dsp.asm rv34: DC-only inverse transform 2012-01-12 09:52:33 +01:00
rv40dsp.c
simple_idct_mmx.c
snowdsp_mmx.c
v210-init.c Fix compilation with yasm-0.6.2 2012-01-12 16:35:49 +01:00
v210.asm Fix compilation with yasm-0.6.2 2012-01-12 16:35:49 +01:00
vc1dsp_mmx.c
vc1dsp_yasm.asm Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
vp3dsp.asm
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm