virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

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

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

Originally committed as revision 18199 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
2009-03-27 00:01:06 +00:00
parent b6fec3eb7f
commit d95a0c67ae
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -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)

6
doc/general.texi
View File

@@ -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

3
libavformat/Makefile
View File

@@ -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

0
output_example.c → libavformat/output-example.c
View File