[FFmpeg-cvslog] Merge commit '39dc4a6bb34baf833ce1e5eabad7d0dbf933237d' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  3 22:53:25 2014 +0100| [b967c10029bd35623b306168ac6fdf86cb3d080e] | committer: Michael Niedermayer

Merge commit '39dc4a6bb34baf833ce1e5eabad7d0dbf933237d' into release/2.2

* commit '39dc4a6bb34baf833ce1e5eabad7d0dbf933237d':
  x86: dca: Add missing multiple inclusion guards
  gitignore: Add all examples below doc/examples
  arm: Mark the stack as non-executable
  doxygen: Replace @parblock syntax with manual linebreaks
  doxygen: Add a number of missing function parameter descriptions

Conflicts:
	.gitignore
	libavformat/avformat.h

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=b967c10029bd35623b306168ac6fdf86cb3d080e
---