Merge commit 'ab81f24ad43bddf77ddd25cba86780c1c884996c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 00:31:00 +0000 (01:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 00:31:00 +0000 (01:31 +0100)
commit6d34aa245df8e345ee73b6be3a4d24526e766ad5
tree30a7762f6de781a063a55de69e78f6fde3ac1e7b
parent5ded4332f195869df4b8b6b667cdb445113b8e34
parentab81f24ad43bddf77ddd25cba86780c1c884996c
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@gmx.at>
Makefile
configure
doc/Makefile