Skip to content
Snippets Groups Projects
Commit 6d34aa24 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'ab81f24a'


* commit 'ab81f24a':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 5ded4332 ab81f24a
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment