[FFmpeg-cvslog] Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 17 01:48:42 2014 +0100| [1fc74926a5d13261721e1c9962c48db00d214853] | committer: Michael Niedermayer

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
  Move all example programs to doc/examples

Conflicts:
	configure
	doc/Makefile
	doc/doxy-wrapper.sh
	doc/examples/avcodec.c
	doc/examples/decoding_encoding.c
	doc/examples/metadata.c
	doc/examples/muxing.c
	doc/examples/transcode_aac.c
	libavcodec/Makefile
	libavcodec/api-example.c
	libavformat/Makefile

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

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