[FFmpeg-cvslog] Merge commit '19d3127867f001d007f98bc8c5a85c5409abf788'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 15:12:32 2014 +0100| [cbf09bb63f31f100761d607a1cef5141bdfa96fa] | committer: Michael Niedermayer

Merge commit '19d3127867f001d007f98bc8c5a85c5409abf788'

* commit '19d3127867f001d007f98bc8c5a85c5409abf788':
  doxygen: Set EXAMPLE_PATH from within doxy-wrapper.sh

Conflicts:
	doc/Doxyfile
	doc/doxy-wrapper.sh

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

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