[FFmpeg-cvslog] Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 15:23:29 2014 +0100| [71052d85c16bd65fa1e3e01d9040f9a3925efd7a] | committer: Michael Niedermayer

Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'

* commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3':
  build: doxy: Include code examples in Doxygen documentation

Conflicts:
	doc/Makefile

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

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