• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 86e107a7
    Michael Niedermayer authored
    * qatar/master:
      cosmetics: Consistently use C-style comments with multiple inclusion guards
      anm: fix a few Doxygen comments
      misc typo and wording fixes
      attributes: add av_noreturn
      attributes: drop pointless define guards
      configure: do not disable av_always_inline with --enable-small
      flvdec: initial stream switch support
      avplay: fix write on freed memory for rawvideo
      snow: remove a VLA used for edge emulation
      x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
      snow: remove the runs[] VLA.
      snow: Check mallocs at init
      flacdec: remove redundant setting of avctx->sample_fmt
    
    Conflicts:
    	ffplay.c
    	libavcodec/h264.c
    	libavcodec/snow.c
    	libavcodec/snow.h
    	libavcodec/snowdec.c
    	libavcodec/snowenc.c
    	libavformat/flvdec.c
    	libavutil/attributes.h
    	tools/patcheck
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    86e107a7
xvmc.h 5.85 KB