• Michael Niedermayer's avatar
    Merge commit '5e9c6ef8' · e13d5e9a
    Michael Niedermayer authored
    * commit '5e9c6ef8':
      x86: h264_weight_10bit: port to cpuflags
      libtheoraenc: add missing pixdesc.h header
      avcodec: remove ff_is_hwaccel_pix_fmt
      pixdesc: add av_pix_fmt_get_chroma_sub_sample
      hlsenc: stand alone hls segmenter
    
    Conflicts:
    	doc/muxers.texi
    	libavcodec/ffv1enc.c
    	libavcodec/imgconvert.c
    	libavcodec/mpegvideo_enc.c
    	libavcodec/tiffenc.c
    	libavformat/Makefile
    	libavformat/allformats.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e13d5e9a
allformats.c 11.2 KB