diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 04:48:42 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-17 05:22:01 +0400 |
| commit | 1fc74926a5d13261721e1c9962c48db00d214853 (patch) | |
| tree | 8215350a6b41a26d8d9041e594e6b927ed8e5e40 /common.mak | |
| 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 'common.mak')
| -rw-r--r-- | common.mak | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common.mak b/common.mak index 50469a16a7..b557dff30f 100644 --- a/common.mak +++ b/common.mak @@ -96,7 +96,6 @@ TESTPROGS += $(TESTPROGS-yes) LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS) -EXAMPLES := $(EXAMPLES:%=$(SUBDIR)%-example$(EXESUF)) OBJS := $(sort $(OBJS:%=$(SUBDIR)%)) SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%)) TESTOBJS := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o) |