Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Dec 2011 00:25:37 +0000 (01:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Dec 2011 00:25:37 +0000 (01:25 +0100)
commit7fad19a63dc52db4bf2bebbd9d261675956b1b34
tree8997428f45d54f3177dc6cd208d0375daa6fe201
parent16abd687798bbf9192ba4954765e61de96065b8b
parent599b4c6efddaed33b1667c386b34b07729ba732b
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>
74 files changed:
avconv.c
cmdutils.h
doc/avconv.texi
doc/ffserver.texi
doc/protocols.texi
doc/soc.txt
ffmpeg.c
ffplay.c
ffserver.c
libavcodec/avcodec.h
libavcodec/binkaudio.c
libavcodec/bitstream.c
libavcodec/eatgv.c
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264pred_template.c
libavcodec/lpc.h
libavcodec/mjpegdec.c
libavcodec/proresdec_lgpl.c
libavcodec/tscc.c
libavcodec/utils.c
libavcodec/vaapi_mpeg4.c
libavcodec/vc1dec.c
libavcodec/vc1dsp.c
libavcodec/wmaprodec.c
libavcodec/wmavoice.c
libavcodec/x86/h264_i386.h
libavcodec/x86/vc1dsp_yasm.asm
libavdevice/jack_audio.c
libavdevice/timefilter.h
libavformat/4xm.c
libavformat/aiffdec.c
libavformat/aiffenc.c
libavformat/avformat.h
libavformat/cafdec.c
libavformat/ffmdec.c
libavformat/ffmenc.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/gxfenc.c
libavformat/http.c
libavformat/id3v2.c
libavformat/img2.c
libavformat/iv8.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mms.h
libavformat/mov.c
libavformat/movenc.c
libavformat/movenc.h
libavformat/movenchint.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mxfenc.c
libavformat/nuv.c
libavformat/rdt.c
libavformat/rtmppkt.c
libavformat/rtmpproto.c
libavformat/rtp.h
libavformat/rtpenc_h264.c
libavformat/sdp.c
libavformat/soxdec.c
libavformat/soxenc.c
libavformat/thp.c
libavformat/udp.c
libavformat/utils.c
libavutil/eval.h
libavutil/intfloat_readwrite.h
libpostproc/postprocess.c
libpostproc/postprocess_internal.h
libswscale/rgb2rgb.c
libswscale/swscale.c
libswscale/x86/swscale_mmx.c
tools/patcheck