FFmpeg/libavformat
Michael Niedermayer 7d8f115843 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  mpegenc: use avctx->slices as number of slices
  v410enc: fix undefined signed left shift caused by integer promotion
  Release notes: mention cleaned up header includes
  fix Changelog file
  Fix a bunch of typos.
  Drop some pointless void* return value casts from av_malloc() invocations.
  wavpack: fix typos in previous cosmetic clean-up commit
  wavpack: cosmetics: K&R pretty-printing
  avconv: remove the 'codec framerate is different from stream' warning
  wavpack: determine sample_fmt before requesting a buffer
  bmv audio: implement new audio decoding API
  mpegaudiodec: skip all channels when skipping granules
  mpegenc: simplify muxrate calculation

Conflicts:
	Changelog
	avconv.c
	doc/RELEASE_NOTES
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo.c
	libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-03 03:06:45 +01:00
..
2011-11-30 20:34:45 +01:00
2011-12-28 20:17:20 +01:00
2011-12-12 20:21:47 +01:00
2011-11-05 16:51:25 +01:00
2011-12-24 23:21:40 +01:00
2011-12-24 03:41:50 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-12-23 23:59:10 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-08-01 00:58:49 +02:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-08-09 19:56:25 +02:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00
2011-11-30 20:34:45 +01:00
2011-12-04 16:44:20 +01:00
2011-11-03 20:21:01 +01:00
2012-01-02 03:35:23 +01:00
2011-12-29 15:25:07 +01:00
2011-12-28 20:17:20 +01:00
2011-12-30 20:00:53 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2012-01-01 21:19:07 +01:00
2011-12-31 02:27:11 +01:00
2011-12-31 02:27:11 +01:00
2011-08-09 19:56:25 +02:00
2011-12-30 01:44:47 +01:00
2011-12-20 22:38:53 +01:00
2011-12-18 16:23:16 +01:00
2011-10-13 16:50:20 +02:00
2012-01-02 03:35:23 +01:00
2011-12-18 23:54:56 +01:00
2011-12-24 21:26:52 +01:00
2011-11-30 17:39:32 +02:00
2011-12-19 19:11:49 +01:00
2011-12-16 06:02:14 +01:00
2011-12-30 20:00:53 +01:00
2011-12-30 20:00:53 +01:00