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