1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavcodec/x86
Michael Niedermayer a369a6b858 Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
  fate: add golomb-test
  golomb-test: K&R formatting cosmetics
  h264: Split h264-test off into a separate file - golomb-test.c.
  h264-test: cleanup: drop timer invocations, commented out code and other cruft
  h264-test: Remove unused DSP and AVCodec contexts and related init calls.
  adpcm: Add missing stdint.h #include to fix standalone header compilation.
  lavf: add functions for accessing the fourcc<->CodecID mapping tables.
  lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().
  lavc: make avcodec_close() work properly on unopened codecs.
  lavc: add avcodec_is_open().
  lavf: rename AVInputFormat.value to raw_codec_id.
  lavf: remove the pointless value field from flv and iv8
  lavc/lavf: remove unnecessary symbols from the symbol version script.
  lavc: reorder AVCodec fields.
  lavf: reorder AVInput/OutputFormat fields.
  mp3dec: Fix a heap-buffer-overflow
  adpcmenc: remove some unneeded casts
  adpcmenc: use int16_t and uint8_t instead of short and unsigned char.
  adpcmenc: fix adpcm_ms extradata allocation
  adpcmenc: return proper AVERROR codes instead of -1
  ...

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/adpcmenc.c
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/libavcodec.v
	libavcodec/mpc7.c
	libavcodec/mpegaudiodec.c
	libavcodec/options.c
	libavformat/Makefile
	libavformat/avformat.h
	libavformat/flvdec.c
	libavformat/libavformat.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-01 02:36:09 +01:00
..
ac3dsp_mmx.c
ac3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
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 Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
deinterlace.asm
diracdsp_mmx.c
diracdsp_mmx.h
diracdsp_yasm.asm dirac_yasm: fix linking failure due to %ifndef 2012-01-28 09:06:03 +01:00
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' 2012-01-31 02:46:26 +01:00
dsputil_mmx.h
dsputil_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-01-31 02:46:26 +01:00
dsputilenc_mmx.c
dsputilenc_yasm.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dwt_yasm.asm dirac_yasm: fix linking failure due to %ifndef 2012-01-28 09:06:03 +01:00
dwt.c
dwt.h
fdct_mmx.c
fft_3dn2.c
fft_3dn.c
fft_mmx.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
fft_sse.c
fft.c
fft.h
fmtconvert_mmx.c Merge remote-tracking branch 'qatar/master' 2012-02-01 02:36:09 +01:00
fmtconvert.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_chromamc_10bit.asm config.asm: change %ifdef directives to %if directives. 2012-01-27 10:19:57 +08:00
h264_chromamc.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_deblock_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_deblock.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_i386.h Revert "Revert commit 599b4c6efddaed33b1667c386b34b07729ba732b" 2012-01-09 03:32:06 +01:00
h264_idct_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_idct.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_intrapred_10bit.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_intrapred_init.c
h264_intrapred.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264_qpel_10bit.asm config.asm: change %ifdef directives to %if directives. 2012-01-27 10:19:57 +08:00
h264_qpel_mmx.c
h264_weight_10bit.asm config.asm: change %ifdef directives to %if directives. 2012-01-27 10:19:57 +08:00
h264_weight.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h264dsp_mmx.c
idct_mmx_xvid.c
idct_mmx.c
idct_sse2_xvid.c
idct_xvid.h
imdct36_sse.asm Merge remote-tracking branch 'qatar/master' 2012-01-30 05:20:58 +01:00
lpc_mmx.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-01 02:36:09 +01:00
mathops.h
mlpdsp.c
motion_est_mmx.c
mpegaudiodec_mmx.c Fix compilation without HAVE_AVX, HAVE_YASM etc. 2012-01-14 23:09:39 +01:00
mpegvideo_mmx_template.c
mpegvideo_mmx.c
pngdsp-init.c Merge remote-tracking branch 'qatar/master' 2012-01-31 02:46:26 +01:00
pngdsp.asm png: add support for bpp>4 to paeth x86 SIMD code. 2012-01-29 21:22:50 -08:00
proresdsp-init.c
proresdsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rv34dsp_init.c rv34: 1-pass inter MB reconstruction 2012-01-16 19:26:41 +01:00
rv34dsp.asm Use correct register size. 2012-01-17 08:41:39 +01:00
rv40dsp_init.c rv40: x86 SIMD for biweight 2012-01-30 23:58:25 +01:00
rv40dsp.asm rv40: x86 SIMD for biweight 2012-01-30 23:58:25 +01:00
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
vp3dsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
vp8dsp-init.c
vp8dsp.asm
vp56_arith.h
vp56dsp_init.c
vp56dsp.asm Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00