• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c617bed3
    Michael Niedermayer authored
    * qatar/master:
      MSS1 and MSS2: set final pixel format after common stuff has been initialised
      MSS2 decoder
      configure: handle --disable-asm before check_deps
      x86: Split inline and external assembly #ifdefs
      configure: x86: Separate inline from standalone assembler capabilities
      pktdumper: Use a custom define instead of PATH_MAX for buffers
      pktdumper: Use av_strlcpy instead of strncpy
      pktdumper: Use sizeof(variable) instead of the direct buffer length
    
    Conflicts:
    	Changelog
    	configure
    	libavcodec/allcodecs.c
    	libavcodec/avcodec.h
    	libavcodec/codec_desc.c
    	libavcodec/dct-test.c
    	libavcodec/imgconvert.c
    	libavcodec/mss12.c
    	libavcodec/version.h
    	libavfilter/x86/gradfun.c
    	libswscale/x86/yuv2rgb.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c617bed3
internal.h 5.15 KB