ffmpeg/tools
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
..
aviocat.c Replace usleep() calls with av_usleep() 2012-06-22 17:15:36 +01:00
bisect-create tools/bisect-create: Support "bisect run" 2012-07-24 01:24:23 +02:00
build_libstagefright Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
clean-diff Remove some unused scripts from tools/. 2011-06-06 01:31:02 +02:00
cws2fws.c tools: K&R reformatting cosmetics 2012-01-25 15:31:11 +01:00
enum_options.c tools: add a tool for enumerating/printing AVOptions in texinfo format 2011-10-24 14:18:07 +02:00
ffeval.c tools: add ffeval tool 2012-01-17 12:10:07 +01:00
graph2dot.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
ismindex.c Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 2012-08-07 22:45:46 +02:00
missing_codec_desc tools: add a script to find missing codec descriptors. 2012-08-13 10:44:59 +02:00
patcheck Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +02:00
pktdumper.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
probetest.c probetest: allow specifying parameters on the command line 2012-05-31 15:53:58 +02:00
qt-faststart.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
trasher.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
unwrap-diff Remove some unused scripts from tools/. 2011-06-06 01:31:02 +02:00