[FFmpeg-cvslog] Merge commit '4015829accc2382393d42d62654eb96d896d1326' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  3 23:00:55 2014 +0100| [eb2244ece9cbc4bd26dea553c318635a98c9d6de] | committer: Michael Niedermayer

Merge commit '4015829accc2382393d42d62654eb96d896d1326' into release/2.2

* commit '4015829accc2382393d42d62654eb96d896d1326':
  bit_depth_template: Use file name as multiple inclusion guard
  svq3: Adjust #endif comment
  hevc: Mention the missing SPS in the error message
  doc: Name the MOV muxer as it should be called
  doc: Sort the muxer documentation

Conflicts:
	doc/muxers.texi

All changes are already in our 2.2 branch, this is just for metadata

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb2244ece9cbc4bd26dea553c318635a98c9d6de
---