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>

4 files changed, 5 insertions, 5 deletions

diff --git a/doc/avconv.texi b/doc/avconv.texi
index 14e02f8f95..f83cf590b6 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -29,7 +29,7 @@ rates and resize video on the fly with a high quality polyphase filter.
 avconv reads from an arbitrary number of input "files" (which can be regular
 files, pipes, network streams, grabbing devices, etc.), specified by the
 @code{-i} option, and writes to an arbitrary number of output "files", which are
-specified by a plain output filename. Anything found on the commandline which
+specified by a plain output filename. Anything found on the command line which
 cannot be interpreted as an option is considered to be an output filename.
 
 Each input or output file can in principle contain any number of streams of
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 1b9a494f49..074c075f0b 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -147,7 +147,7 @@ that only captures in stereo and also requires that one channel be flipped.
 If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before
 starting ffmpeg.
 
-@subsection The audio and video loose sync after a while.
+@subsection The audio and video lose sync after a while.
 
 Yes, they do.
 
diff --git a/doc/protocols.texi b/doc/protocols.texi
index c55606b986..eab4a6aff9 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -155,8 +155,8 @@ be seekable, so they will fail with the pipe output protocol.
 
 Real-Time Messaging Protocol.
 
-The Real-Time Messaging Protocol (RTMP) is used for streaming
-multimedia content across a TCP/IP network.
+The Real-Time Messaging Protocol (RTMP) is used for streaming multimedia
+content across a TCP/IP network.
 
 The required syntax is:
 @example
diff --git a/doc/soc.txt b/doc/soc.txt
index 79d77d1cd7..2504dba553 100644
--- a/doc/soc.txt
+++ b/doc/soc.txt
@@ -18,7 +18,7 @@ essential that changes to their codebase are publicly visible, clean and
 easy reviewable that again leads us to:
 * use of a revision control system like git
 * separation of cosmetic from non-cosmetic changes (this is almost entirely
-  ignored by mentors and students in soc 2006 which might lead to a suprise
+  ignored by mentors and students in soc 2006 which might lead to a surprise
   when the code will be reviewed at the end before a possible inclusion in
   FFmpeg, individual changes were generally not reviewable due to cosmetics).
 * frequent commits, so that comments can be provided early