[FFmpeg-cvslog] r18199 - in trunk: . Makefile doc/general.texi libavformat libavformat/Makefile libavformat/output-example.c output_example.c

[diego]

Author: diego
Date: Fri Mar 27 01:01:06 2009
New Revision: 18199

Log:
Move output_example.c --> libavformat/output-example.c.
The libavformat directory is a better place for a libavformat API example.

Added:
   trunk/libavformat/output-example.c
      - copied unchanged from r18195, trunk/output_example.c
Deleted:
   trunk/output_example.c
Modified:
   trunk/   (props changed)
   trunk/Makefile
   trunk/doc/general.texi
   trunk/libavformat/   (props changed)
   trunk/libavformat/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Thu Mar 26 22:46:45 2009	(r18198)
+++ trunk/Makefile	Fri Mar 27 01:01:06 2009	(r18199)
@@ -25,8 +25,6 @@ FFLIBS := avdevice avformat avcodec avut
 
 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 += $(FFS
 %_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)
 

Modified: trunk/doc/general.texi
==============================================================================
--- trunk/doc/general.texi	Thu Mar 26 22:46:45 2009	(r18198)
+++ trunk/doc/general.texi	Fri Mar 27 01:01:06 2009	(r18199)
@@ -753,7 +753,7 @@ Application Wizard, uncheck the "Precomp
 @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
- at file{output_example.c} from the FFmpeg distribution.
+ at 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/apie
 
 @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
 

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	Thu Mar 26 22:46:45 2009	(r18198)
+++ trunk/libavformat/Makefile	Fri Mar 27 01:01:06 2009	(r18199)
@@ -243,6 +243,9 @@ OBJS-$(CONFIG_RTP_PROTOCOL)             
 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