Commit ebce16e7 authored by diego's avatar diego

Move output_example.c --> libavformat/output-example.c.

The libavformat directory is a better place for a libavformat API example.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18199 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 9bee0758
...@@ -25,8 +25,6 @@ FFLIBS := avdevice avformat avcodec avutil swscale ...@@ -25,8 +25,6 @@ FFLIBS := avdevice avformat avcodec avutil swscale
DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset) DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
EXAMPLES = output_example$(EXESUF)
include common.mak include common.mak
FF_LDFLAGS := $(FFLDFLAGS) FF_LDFLAGS := $(FFLDFLAGS)
...@@ -69,9 +67,6 @@ ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) ...@@ -69,9 +67,6 @@ ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) %_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
$(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) $(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 tools/%$(EXESUF): tools/%.c
$(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
......
...@@ -753,7 +753,7 @@ Application Wizard, uncheck the "Precompiled headers" option. ...@@ -753,7 +753,7 @@ Application Wizard, uncheck the "Precompiled headers" option.
@item Write the source code for your application, or, for testing, just @item Write the source code for your application, or, for testing, just
copy the code from an existing sample application into the source file copy the code from an existing sample application into the source file
that MSVC++ has already created for you. For example, you can copy 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" @item Open the "Project / Properties" dialog box. In the "Configuration"
combo box, select "All Configurations" so that the changes you make will 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. ...@@ -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 @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 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 player. See @file{libavformat/output-example.c} to use it to generate
streams. audio or video streams.
@end itemize @end itemize
......
...@@ -243,6 +243,9 @@ OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o ...@@ -243,6 +243,9 @@ OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
EXAMPLES = output-example
TESTPROGS = timefilter TESTPROGS = timefilter
$(SUBDIR)output-example$(EXESUF): $(FF_DEP_LIBS)
include $(SUBDIR)../subdir.mak include $(SUBDIR)../subdir.mak
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment