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 /configure | |
| 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 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -1164,6 +1164,10 @@ COMPONENT_LIST=" protocols " +EXAMPLE_LIST=" + muxing_example +" + EXTERNAL_LIBRARY_LIST=" avisynth bzlib @@ -1264,6 +1268,7 @@ PROGRAM_LIST=" CONFIG_LIST=" $COMPONENT_LIST $DOCUMENT_LIST + $EXAMPLE_LIST $EXTERNAL_LIBRARY_LIST $HWACCEL_LIST $LIBRARY_LIST @@ -2269,6 +2274,9 @@ tinterlace_merge_test_deps="tinterlace_filter" tinterlace_pad_test_deps="tinterlace_filter" zmq_filter_deps="libzmq" +# examples +muxing_example_deps="avcodec avformat avutil swscale" + # libraries avcodec_deps="avutil" avdevice_deps="avutil avcodec avformat" @@ -2339,6 +2347,7 @@ host_os=$target_os_default # configurable options enable $PROGRAM_LIST enable $DOCUMENT_LIST +enable $EXAMPLE_LIST enable $(filter_out avresample $LIBRARY_LIST) enable stripping |