[FFmpeg-cvslog] Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 26 01:31:00 2013 +0100| [6d34aa245df8e345ee73b6be3a4d24526e766ad5] | committer: Michael Niedermayer

Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'

* commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c':
  build: Integrate multilibrary examples into the build system

Conflicts:
	configure
	doc/Makefile
	doc/examples/muxing.c
	doc/examples/output.c
	libavformat/Makefile
	libavformat/output-example.c

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

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