diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-03-27 00:01:06 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-03-27 00:01:06 +0000 |
| commit | d95a0c67ae1dbcace6b4043a6cbedcc23d3f319d (patch) | |
| tree | 222ef775d16278f83234c02be94aed3c65fb55d9 | |
| parent | b6fec3eb7f9ddfda25202eb272900ffdeeb753b3 (diff) | |
Move output_example.c --> libavformat/output-example.c.
The libavformat directory is a better place for a libavformat API example.
Originally committed as revision 18199 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | doc/general.texi | 6 | ||||
| -rw-r--r-- | libavformat/Makefile | 3 | ||||
| -rw-r--r-- | libavformat/output-example.c (renamed from output_example.c) | 0 |
4 files changed, 6 insertions, 8 deletions
@@ -25,8 +25,6 @@ FFLIBS := avdevice avformat avcodec avutil swscale DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset) -EXAMPLES = output_example$(EXESUF) - include common.mak FF_LDFLAGS := $(FFLDFLAGS) @@ -69,9 +67,6 @@ ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) $(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) -output_example$(EXESUF): output_example.o $(FF_DEP_LIBS) - $(CC) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) - tools/%$(EXESUF): tools/%.c $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) diff --git a/doc/general.texi b/doc/general.texi index 6a14b17ebe..a19c3b180b 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -753,7 +753,7 @@ Application Wizard, uncheck the "Precompiled headers" option. @item Write the source code for your application, or, for testing, just copy the code from an existing sample application into the source file that MSVC++ has already created for you. For example, you can copy -@file{output_example.c} from the FFmpeg distribution. +@file{libavformat/output-example.c} from the FFmpeg distribution. @item Open the "Project / Properties" dialog box. In the "Configuration" combo box, select "All Configurations" so that the changes you make will @@ -967,8 +967,8 @@ decoding). Look at @file{libavcodec/apiexample.c} to see how to use it. @item libavformat is the library containing the file format handling (mux and demux code for several formats). Look at @file{ffplay.c} to use it in a -player. See @file{output_example.c} to use it to generate audio or video -streams. +player. See @file{libavformat/output-example.c} to use it to generate +audio or video streams. @end itemize diff --git a/libavformat/Makefile b/libavformat/Makefile index 579c7bcceb..7585618df3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -243,6 +243,9 @@ OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o +EXAMPLES = output-example TESTPROGS = timefilter +$(SUBDIR)output-example$(EXESUF): $(FF_DEP_LIBS) + include $(SUBDIR)../subdir.mak diff --git a/output_example.c b/libavformat/output-example.c index c6cd99f7b8..c6cd99f7b8 100644 --- a/output_example.c +++ b/libavformat/output-example.c |