ffmpeg/libavcodec
Michael Niedermayer 7fad19a63d Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: cabac: replace explicit memory references with "m" operands
  avplay: don't request a stereo downmix
  wmapro: use av_float2int()
  lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
  lavu: replace int/float punning functions
  lavfi: install libavfilter/vsrc_buffer.h
  Remove extraneous semicolons
  sdp: Restore the original mp4 format h264 extradata if converted
  rtpenc: Add support for mp4 format h264
  rtpenc: Simplify code by introducing a separate end pointer
  movenc: Use the actual converted sample for RTP hinting
  Fix a bunch of common typos.

Conflicts:
	doc/developer.texi
	doc/eval.texi
	doc/filters.texi
	doc/protocols.texi
	ffmpeg.c
	ffplay.c
	libavcodec/mpegvideo.h
	libavcodec/x86/cabac.h
	libavfilter/Makefile
	libavformat/avformat.h
	libavformat/cafdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/gxfenc.c
	libavformat/img2.c
	libavformat/movenc.c
	libavformat/mpegts.c
	libavformat/rtpenc_h264.c
	libavformat/utils.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-12 01:25:37 +01:00
..
2011-11-27 21:19:07 +01:00
2011-11-25 13:19:54 +00:00
2011-11-06 09:37:34 +01:00
2011-11-12 20:47:33 +01:00
2011-11-12 19:36:23 +01:00
2011-11-12 19:37:24 +01:00
2011-11-12 20:01:05 +01:00
2011-11-12 20:01:50 +01:00
2011-11-12 20:05:35 +01:00
2011-11-14 18:14:20 +01:00
2011-12-11 00:32:25 +01:00
2011-11-12 20:07:31 +01:00
2011-12-10 11:58:03 +01:00
2011-11-09 23:10:07 +01:00
2011-12-11 00:32:25 +01:00
2011-12-03 03:00:49 +01:00
2011-12-03 03:00:44 +01:00
2011-11-19 04:07:26 +01:00
2011-11-12 21:00:12 +01:00
2011-11-13 15:43:09 +01:00
2011-11-13 03:01:30 +01:00
2011-11-24 15:39:41 +01:00
2011-12-11 00:32:25 +01:00
2011-12-05 03:22:06 +01:00
2011-11-11 18:40:19 +01:00
2011-11-12 20:15:21 +01:00
2011-11-12 20:15:56 +01:00
2011-12-06 13:48:25 +00:00
2011-11-12 20:17:56 +01:00
2011-12-02 03:23:07 +01:00
2011-12-01 18:46:22 +01:00
2011-11-15 00:41:36 +01:00
2011-11-15 00:41:36 +01:00
2011-11-12 20:49:53 +01:00