git.ffmpeg.org Git - ffmpeg.git/commit

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>

author	Michael Niedermayer <michaelni@gmx.at>
	Thu, 16 Aug 2012 14:12:45 +0000 (16:12 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Thu, 16 Aug 2012 14:20:30 +0000 (16:20 +0200)
commit	c581cb4e4fd3f8387766d3606560b2900728883a
tree	ecaecc6d276510379d8e399e88937c10a778be85	tree \| snapshot
parent	208d6e6615e3c2e09de5aab92745e13da86aa827	commit \| diff
parent	232e35de2e139cc2d34ed67a34dedbbc5da56052	commit \| diff

configure	diff1 \|	diff2 \|	blob \| history
doc/examples/decoding_encoding.c	diff1 \|	diff2 \|	blob \| history
doc/protocols.texi	diff1 \|	diff2 \|	blob \| history
libavcodec/8bps.c	diff1 \|	diff2 \|	blob \| history
libavcodec/8svx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/Makefile	diff1 \|	diff2 \|	blob \| history
libavcodec/a64multienc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/aac_ac3_parser.c	diff1 \|	diff2 \|	blob \| history
libavcodec/acelp_filters.c	diff1 \|	diff2 \|	blob \| history
libavcodec/acelp_pitch_delay.c	diff1 \|	diff2 \|	blob \| history
libavcodec/acelp_vectors.c	diff1 \|	diff2 \|	blob \| history
libavcodec/allcodecs.c	diff1 \|	diff2 \|	blob \| history
libavcodec/amr.h	diff1 \|	diff2 \|	blob \| history
libavcodec/amrwbdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ansi.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ass.c	diff1 \|	diff2 \|	blob \| history
libavcodec/assdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/assenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/atrac.c	diff1 \|	diff2 \|	blob \| history
libavcodec/audio_frame_queue.c	diff1 \|	diff2 \|	blob \| history
libavcodec/audioconvert.c	diff1 \|	diff2 \|	blob \| history
libavcodec/aura.c	diff1 \|	diff2 \|	blob \| history
libavcodec/avpacket.c	diff1 \|	diff2 \|	blob \| history
libavcodec/bitstream_filter.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cavsdsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/celp_filters.c	diff1 \|	diff2 \|	blob \| history
libavcodec/celp_math.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cinepak.c	diff1 \|	diff2 \|	blob \| history
libavcodec/codec_desc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cscd.c	diff1 \|	diff2 \|	blob \| history
libavcodec/cyuv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dirac_parser.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dnxhddata.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dpxenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dump_extradata_bsf.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dv_profile.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dvdsub_parser.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dwt.c	diff1 \|	diff2 \|	blob \| history
libavcodec/dxa.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eacmv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/eaidct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/elbg.c	diff1 \|	diff2 \|	blob \| history
libavcodec/faanidct.c	diff1 \|	diff2 \|	blob \| history
libavcodec/fmtconvert.c	diff1 \|	diff2 \|	blob \| history
libavcodec/g722enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264_mp4toannexb_bsf.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/h264idct_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/idcinvideo.c	diff1 \|	diff2 \|	blob \| history
libavcodec/iirfilter.c	diff1 \|	diff2 \|	blob \| history
libavcodec/imgconvert.c	diff1 \|	diff2 \|	blob \| history
libavcodec/intrax8dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/jpegls.h	diff1 \|	diff2 \|	blob \| history
libavcodec/kgv1dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/lclenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libfaac.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libfdk-aacenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libgsm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libilbc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libmp3lame.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libopencore-amr.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libspeexdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libspeexenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libtheoraenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libvo-amrwbenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libvpxdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libvpxenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/libx264.c	diff1 \|	diff2 \|	blob \| history
libavcodec/lpc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/lzw.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mace.c	diff1 \|	diff2 \|	blob \| history
libavcodec/motion-test.c	diff1 \|	diff2 \|	blob \| history
libavcodec/movsub_bsf.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mp3_header_compress_bsf.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mp3_header_decompress_bsf.c	diff1 \|	diff2 \|	blob \| history
libavcodec/mpegaudio_parser.c	diff1 \|	diff2 \|	blob \| history
libavcodec/msvideo1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/noise_bsf.c	diff1 \|	diff2 \|	blob \| history
libavcodec/nuv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/options.c	diff1 \|	diff2 \|	blob \| history
libavcodec/options_table.h	diff1 \|	diff2 \|	blob \| history
libavcodec/parser.c	diff1 \|	diff2 \|	blob \| history
libavcodec/pnm.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/dsputil_ppc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/fmtconvert_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/gmc_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/h264_altivec_template.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ppc/vp8dsp_altivec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/proresdsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/psymodel.c	diff1 \|	diff2 \|	blob \| history
libavcodec/pthread.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ptx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/qdrw.c	diff1 \|	diff2 \|	blob \| history
libavcodec/r210dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ra144.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ra288.h	diff1 \|	diff2 \|	blob \| history
libavcodec/raw.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rawdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rawenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/resample.c	diff1 \|	diff2 \|	blob \| history
libavcodec/resample2.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rl2.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rle.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rpza.c	diff1 \|	diff2 \|	blob \| history
libavcodec/rtjpeg.h	diff1 \|	diff2 \|	blob \| history
libavcodec/rv40dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/s302m.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sinewin_tablegen.h	diff1 \|	diff2 \|	blob \| history
libavcodec/sipr.h	diff1 \|	diff2 \|	blob \| history
libavcodec/sipr16k.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sparc/dsputil_vis.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sparc/simple_idct_vis.c	diff1 \|	diff2 \|	blob \| history
libavcodec/srtdec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/sunrast.c	diff1 \|	diff2 \|	blob \| history
libavcodec/targaenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/tiff.c	diff1 \|	diff2 \|	blob \| history
libavcodec/tiffenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/tmv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/truemotion1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/v210dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/v210x.c	diff1 \|	diff2 \|	blob \| history
libavcodec/v410dec.c	diff1 \|	diff2 \|	blob \| history
libavcodec/v410enc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vc1dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vcr1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vmdav.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vmnc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vorbis_data.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp3dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp56dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/vp8dsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/ws-snd1.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/Makefile	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/idct_mmx_xvid.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/idct_sse2_xvid.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/lpc_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/mlpdsp.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/motion_est_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/pngdsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/proresdsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/rv40dsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/simple_idct_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vc1dsp_mmx.c	diff1 \|	diff2 \|	blob \| history
libavcodec/x86/vp8dsp_init.c	diff1 \|	diff2 \|	blob \| history
libavcodec/xbmenc.c	diff1 \|	diff2 \|	blob \| history
libavcodec/xl.c	diff1 \|	diff2 \|	blob \| history
libavcodec/zmbv.c	diff1 \|	diff2 \|	blob \| history
libavcodec/zmbvenc.c	diff1 \|	diff2 \|	blob \| history
libavdevice/avdevice.c	diff1 \|	diff2 \|	blob \| history
libavdevice/timefilter.c	diff1 \|	diff2 \|	blob \| history
libavfilter/af_aformat.c	diff1 \|	diff2 \|	blob \| history
libavfilter/af_amix.c	diff1 \|	diff2 \|	blob \| history
libavfilter/af_anull.c	diff1 \|	diff2 \|	blob \| history
libavfilter/af_asyncts.c	diff1 \|	diff2 \|	blob \| history
libavfilter/af_channelmap.c	diff1 \|	diff2 \|	blob \| history
libavfilter/af_channelsplit.c	diff1 \|	diff2 \|	blob \| history
libavfilter/af_join.c	diff1 \|	diff2 \|	blob \| history
libavfilter/allfilters.c	diff1 \|	diff2 \|	blob \| history
libavfilter/asink_anullsink.c	diff1 \|	diff2 \|	blob \| history
libavfilter/asrc_anullsrc.c	diff1 \|	diff2 \|	blob \| history
libavfilter/audio.c	diff1 \|	diff2 \|	blob \| history
libavfilter/avfilter.c	diff1 \|	diff2 \|	blob \| history
libavfilter/avfiltergraph.c	diff1 \|	diff2 \|	blob \| history
libavfilter/buffer.c	diff1 \|	diff2 \|	blob \| history
libavfilter/buffersink.c	diff1 \|	diff2 \|	blob \| history
libavfilter/buffersrc.c	diff1 \|	diff2 \|	blob \| history
libavfilter/drawutils.c	diff1 \|	diff2 \|	blob \| history
libavfilter/f_settb.c	diff1 \|	diff2 \|	blob \| history
libavfilter/fifo.c	diff1 \|	diff2 \|	blob \| history
libavfilter/formats.c	diff1 \|	diff2 \|	blob \| history
libavfilter/graphparser.c	diff1 \|	diff2 \|	blob \| history
libavfilter/split.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_aspect.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_blackframe.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_boxblur.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_copy.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_crop.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_cropdetect.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_delogo.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_drawbox.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_drawtext.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_fade.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_fieldorder.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_format.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_fps.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_gradfun.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_hflip.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_hqdn3d.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_lut.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_null.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_overlay.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_pad.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_pixdesctest.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_scale.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_select.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_setpts.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_showinfo.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_slicify.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_transpose.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vf_vflip.c	diff1 \|	diff2 \|	blob \| history
libavfilter/video.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vsink_nullsink.c	diff1 \|	diff2 \|	blob \| history
libavfilter/vsrc_testsrc.c	diff1 \|	diff2 \|	blob \| history
libavfilter/x86/gradfun.c	diff1 \|	diff2 \|	blob \| history
libavfilter/x86/yadif.c	diff1 \|	diff2 \|	blob \| history
libavformat/network.c	diff1 \|	diff2 \|	blob \| history
libavformat/rtmpproto.c	diff1 \|	diff2 \|	blob \| history
libavformat/version.h	diff1 \|	diff2 \|	blob \| history
libavresample/utils.c	diff1 \|	diff2 \|	blob \| history
libavutil/audioconvert.c	diff1 \|	diff2 \|	blob \| history
libavutil/avstring.c	diff1 \|	diff2 \|	blob \| history
libavutil/dict.c	diff1 \|	diff2 \|	blob \| history
libavutil/error.c	diff1 \|	diff2 \|	blob \| history
libavutil/eval.c	diff1 \|	diff2 \|	blob \| history
libavutil/fifo.h	diff1 \|	diff2 \|	blob \| history
libavutil/file.c	diff1 \|	diff2 \|	blob \| history
libavutil/file.h	diff1 \|	diff2 \|	blob \| history
libavutil/imgutils.c	diff1 \|	diff2 \|	blob \| history
libavutil/log.c	diff1 \|	diff2 \|	blob \| history
libavutil/mem.h	diff1 \|	diff2 \|	blob \| history
libavutil/opt.c	diff1 \|	diff2 \|	blob \| history
libavutil/parseutils.c	diff1 \|	diff2 \|	blob \| history
libavutil/samplefmt.c	diff1 \|	diff2 \|	blob \| history
libavutil/samplefmt.h	diff1 \|	diff2 \|	blob \| history
libavutil/timer.h	diff1 \|	diff2 \|	blob \| history
libavutil/tree.c	diff1 \|	diff2 \|	blob \| history
libavutil/version.h	diff1 \|	diff2 \|	blob \| history
libswscale/colorspace-test.c	diff1 \|	diff2 \|	blob \| history
libswscale/swscale.h	diff1 \|	diff2 \|	blob \| history
libswscale/swscale_internal.h	diff1 \|	diff2 \|	blob \| history
tools/graph2dot.c	diff1 \|	diff2 \|	blob \| history