Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jul 2012 22:32:31 +0000 (00:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jul 2012 22:32:31 +0000 (00:32 +0200)
commit86e107a7d468666189506d3edd4f4b5ca14cd59e
tree7270750bbe78c241461a844d7c1c8de3696e3765
parentaf392efe51d5cc3536cb3c75bce8954179222d18
parent1a068bfefd5da09f596e5079b39b418933bad0ea
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
24 files changed:
cmdutils.h
configure
ffplay.c
libavcodec/anm.c
libavcodec/dsputil.h
libavcodec/flacdec.c
libavcodec/h264.c
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snowdec.c
libavcodec/snowenc.c
libavcodec/version.h
libavcodec/xvmc.h
libavfilter/formats.h
libavfilter/version.h
libavfilter/x86/gradfun.c
libavfilter/x86/yadif.c
libavformat/flvdec.c
libavformat/rtp.h
libavformat/version.h
libavutil/arm/intmath.h
libavutil/attributes.h
libavutil/dict.h
tools/patcheck