1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/libavutil/x86
Michael Niedermayer c581cb4e4f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Fix even more missing includes after the common.h removal
  build: Factor out rangecoder dependencies to CONFIG_RANGECODER
  build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
  x86: avcodec: Consistently name all init files
  Add more missing includes after removing the implicit common.h
  Add some more missing includes after removing the implicit common.h
  Don't include common.h from avutil.h
  rtmp: Automatically compute the hash for SWFVerification

Conflicts:
	configure
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/Makefile
	libavcodec/assdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/avpacket.c
	libavcodec/dv_profile.c
	libavcodec/dwt.c
	libavcodec/libtheoraenc.c
	libavcodec/rawdec.c
	libavcodec/rv40dsp.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.h
	libavcodec/vc1dsp.c
	libavcodec/x86/Makefile
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/buffer.c
	libavfilter/formats.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_select.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/version.h
	libavutil/audioconvert.c
	libavutil/error.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 16:20:30 +02:00
..
asm.h Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
bswap.h Merge remote-tracking branch 'qatar/master' 2012-06-25 16:55:31 +02:00
cpu.c Merge remote-tracking branch 'qatar/master' 2012-08-09 19:31:56 +02:00
float_dsp_init.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
float_dsp.asm Merge remote-tracking branch 'qatar/master' 2012-08-07 23:04:55 +02:00
intmath.h x86/intmath.h: Fix mull operand constraints 2012-06-26 01:08:35 +02:00
intreadwrite.h
Makefile Add a float DSP framework to libavutil 2012-06-08 13:14:38 -04:00
timer.h Merge remote-tracking branch 'qatar/master' 2012-07-08 22:33:32 +02:00
w64xmmtest.h Add more missing includes after removing the implicit common.h 2012-08-16 10:49:54 +03:00
x86inc.asm x86inc.asm: remove redundant ifdef __YASM_VER__ 2012-08-08 01:14:18 +02:00
x86util.asm Merge remote-tracking branch 'qatar/master' 2012-07-23 21:25:09 +02:00