ffmpeg/tools
Michael Niedermayer 86e107a7d4 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>
2012-07-04 00:32:31 +02:00
..
aviocat.c Replace usleep() calls with av_usleep() 2012-06-22 17:15:36 +01:00
bisect tools: add bisect script 2012-07-03 13:29:12 +02:00
build_libstagefright Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
clean-diff
cws2fws.c
enum_options.c
ffeval.c
graph2dot.c tools/graph2dot: make dot graph representation a bit more compact 2012-06-26 11:34:38 +02:00
ismindex.c tests and tools: cleanup ffmpeg reference 2012-05-27 15:42:55 +02:00
lavfi-showfiltfmts.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
patcheck Merge remote-tracking branch 'qatar/master' 2012-07-04 00:32:31 +02:00
pktdumper.c Merge remote-tracking branch 'qatar/master' 2012-06-22 22:34:02 +02:00
probetest.c probetest: allow specifying parameters on the command line 2012-05-31 15:53:58 +02:00
qt-faststart.c
trasher.c
unwrap-diff