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

diff --git a/Makefile b/Makefile
index 81b4af8..e6d2ed9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 6a14b17..a19c3b1 100644 (file)
--- 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 579c7bc..7585618 100644 (file)
--- 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
similarity index 100%
rename from output_example.c
rename to libavformat/output-example.c