1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavformat
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
..
2012-07-01 20:59:37 +02:00
2012-06-29 20:22:04 +02:00
2012-06-19 16:26:01 +00:00
2012-06-17 17:10:05 +02:00
2012-06-20 01:56:03 +00:00
2012-06-15 19:44:42 +02:00
2012-06-09 10:57:14 +00:00
2012-05-31 23:50:08 +02:00
2012-06-16 17:59:01 +02:00
2012-05-20 16:29:08 +02:00
2012-06-11 07:35:14 +02:00
2012-07-03 09:53:42 +00:00
2012-05-21 08:51:50 +02:00
2012-06-29 20:22:04 +02:00
2012-06-11 07:35:14 +02:00
2012-06-13 18:51:38 +02:00
2012-06-15 19:44:42 +02:00
2012-06-14 23:52:23 +02:00
2012-06-14 23:52:40 +02:00
2012-06-21 20:52:56 +02:00
2012-06-29 20:22:04 +02:00
2012-06-29 20:21:28 +02:00
2012-06-21 12:14:53 +00:00
2012-06-21 20:52:56 +02:00
2012-05-18 23:34:11 +02:00
2012-06-07 21:30:07 +02:00
2012-06-28 10:12:04 +02:00
2012-06-25 16:20:08 +03:00
2012-06-07 21:09:06 +02:00