• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c581cb4e
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c581cb4e
libfdk-aacenc.c 15.1 KB