diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 01:31:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 01:31:00 +0100 |
| commit | 6d34aa245df8e345ee73b6be3a4d24526e766ad5 (patch) | |
| tree | 30a7762f6de781a063a55de69e78f6fde3ac1e7b /arch.mak | |
| parent | 5ded4332f195869df4b8b6b667cdb445113b8e34 (diff) | |
| parent | ab81f24ad43bddf77ddd25cba86780c1c884996c (diff) | |
| download | ffmpeg-6d34aa245df8e345ee73b6be3a4d24526e766ad5.tar.gz | |
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>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions