diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 01:48:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 02:22:01 +0100 |
| commit | 1fc74926a5d13261721e1c9962c48db00d214853 (patch) | |
| tree | 8215350a6b41a26d8d9041e594e6b927ed8e5e40 /configure | |
| parent | 91253839e14cce9793ee93f184cef609ca8195d5 (diff) | |
| parent | b339182eba34f28de5f1a477cdd2c84f1ef35d90 (diff) | |
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
Move all example programs to doc/examples
Conflicts:
configure
doc/Makefile
doc/doxy-wrapper.sh
doc/examples/avcodec.c
doc/examples/decoding_encoding.c
doc/examples/metadata.c
doc/examples/muxing.c
doc/examples/transcode_aac.c
libavcodec/Makefile
libavcodec/api-example.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1245,7 +1245,7 @@ COMPONENT_LIST=" EXAMPLE_LIST=" avio_reading_example - decoding_encoding_example + avcodec_example demuxing_decoding_example filtering_audio_example filtering_video_example @@ -2403,7 +2403,7 @@ zmq_filter_deps="libzmq" # examples avio_reading="avformat avcodec avutil" -decoding_encoding_example_deps="avcodec avutil" +avcodec_example_deps="avcodec avutil" demuxing_decoding_example_deps="avcodec avformat avutil" filtering_audio_example_deps="avfilter avcodec avformat avutil" filtering_video_example_deps="avfilter avcodec avformat avutil" |