typo: occured --> occurred

[ffmpeg] / libavformat / Makefile

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 6f116ecc26b5193b477d22746115bb2c806deb44..19a331123f89b2e2c0da030583d2aac3beba2326 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -4,11 +4,12 @@
 #
 include ../config.mak
 
-CFLAGS += -I$(SRC_PATH)/libavcodec
+NAME = avformat
+FFLIBS = avcodec avutil
 
 OBJS = allformats.o cutils.o os_support.o sdp.o utils.o
 
-HEADERS = avformat.h avio.h rtp.h rtsp.h rtspcodes.h
+HEADERS = avformat.h avio.h rtsp.h rtspcodes.h
 
 # muxers/demuxers
 OBJS-$(CONFIG_AAC_DEMUXER)               += raw.o
@@ -29,6 +30,7 @@ OBJS-$(CONFIG_AU_MUXER)                  += au.o
 OBJS-$(CONFIG_AVI_DEMUXER)               += avidec.o riff.o
 OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o riff.o
 OBJS-$(CONFIG_AVISYNTH)                  += avisynth.o
+OBJS-$(CONFIG_AVM2_MUXER)                += swf.o
 OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o vocdec.o voc.o
 OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
 OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
@@ -67,6 +69,7 @@ OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER)        += img2.o
 OBJS-$(CONFIG_IMAGE2PIPE_MUXER)          += img2.o
 OBJS-$(CONFIG_INGENIENT_DEMUXER)         += raw.o
 OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
+OBJS-$(CONFIG_IPOD_MUXER)                += movenc.o riff.o isom.o avc.o
 OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.o
 OBJS-$(CONFIG_M4V_DEMUXER)               += raw.o
 OBJS-$(CONFIG_M4V_MUXER)                 += raw.o
@@ -99,6 +102,7 @@ OBJS-$(CONFIG_MPEGTSRAW_DEMUXER)         += mpegts.o
 OBJS-$(CONFIG_MPEGTS_MUXER)              += mpegtsenc.o
 OBJS-$(CONFIG_MPEGVIDEO_DEMUXER)         += raw.o
 OBJS-$(CONFIG_MPJPEG_MUXER)              += mpjpeg.o
+OBJS-$(CONFIG_MSNWC_TCP_DEMUXER)         += msnwc_tcp.o
 OBJS-$(CONFIG_MTV_DEMUXER)               += mtv.o
 OBJS-$(CONFIG_MXF_DEMUXER)               += mxf.o
 OBJS-$(CONFIG_NSV_DEMUXER)               += nsvdec.o
@@ -109,20 +113,43 @@ OBJS-$(CONFIG_NUV_DEMUXER)               += nuv.o riff.o
 OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.o         \
                                             oggparseflac.o   \
                                             oggparseogm.o    \
+                                            oggparsespeex.o  \
                                             oggparsetheora.o \
                                             oggparsevorbis.o \
                                             riff.o
 OBJS-$(CONFIG_OGG_MUXER)                 += oggenc.o
+OBJS-$(CONFIG_PCM_ALAW_DEMUXER)          += raw.o
+OBJS-$(CONFIG_PCM_ALAW_MUXER)            += raw.o
+OBJS-$(CONFIG_PCM_MULAW_DEMUXER)         += raw.o
+OBJS-$(CONFIG_PCM_MULAW_MUXER)           += raw.o
+OBJS-$(CONFIG_PCM_S16BE_DEMUXER)         += raw.o
+OBJS-$(CONFIG_PCM_S16BE_MUXER)           += raw.o
+OBJS-$(CONFIG_PCM_S16LE_DEMUXER)         += raw.o
+OBJS-$(CONFIG_PCM_S16LE_MUXER)           += raw.o
+OBJS-$(CONFIG_PCM_S8_DEMUXER)            += raw.o
+OBJS-$(CONFIG_PCM_S8_MUXER)              += raw.o
+OBJS-$(CONFIG_PCM_U16BE_DEMUXER)         += raw.o
+OBJS-$(CONFIG_PCM_U16BE_MUXER)           += raw.o
+OBJS-$(CONFIG_PCM_U16LE_DEMUXER)         += raw.o
+OBJS-$(CONFIG_PCM_U16LE_MUXER)           += raw.o
+OBJS-$(CONFIG_PCM_U8_DEMUXER)            += raw.o
+OBJS-$(CONFIG_PCM_U8_MUXER)              += raw.o
 OBJS-$(CONFIG_PSP_MUXER)                 += movenc.o riff.o isom.o avc.o
 OBJS-$(CONFIG_PVA_DEMUXER)               += pva.o
 OBJS-$(CONFIG_RAWVIDEO_DEMUXER)          += raw.o
 OBJS-$(CONFIG_RAWVIDEO_MUXER)            += raw.o
 OBJS-$(CONFIG_REDIR_DEMUXER)             += rtsp.o
+OBJS-$(CONFIG_RL2_DEMUXER)               += rl2.o
 OBJS-$(CONFIG_RM_DEMUXER)                += rmdec.o
 OBJS-$(CONFIG_RM_MUXER)                  += rmenc.o
 OBJS-$(CONFIG_ROQ_DEMUXER)               += idroq.o
 OBJS-$(CONFIG_ROQ_MUXER)                 += raw.o
-OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o rtpenc.o rtp_mpv.o rtp_aac.o
+OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o         \
+                                            rtpenc.o      \
+                                            rtp_mpv.o     \
+                                            rtp_aac.o     \
+                                            rtpenc_h264.o \
+                                            avc.o
 OBJS-$(CONFIG_RTSP_DEMUXER)              += rtsp.o
 OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o rtp.o rtpdec.o rtp_h264.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
@@ -140,6 +167,7 @@ OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER)        += tiertexseq.o
 OBJS-$(CONFIG_TTA_DEMUXER)               += tta.o
 OBJS-$(CONFIG_TXD_DEMUXER)               += txd.o
 OBJS-$(CONFIG_VC1_DEMUXER)               += raw.o
+OBJS-$(CONFIG_VC1T_DEMUXER)              += vc1test.o
 OBJS-$(CONFIG_VMD_DEMUXER)               += sierravmd.o
 OBJS-$(CONFIG_VOC_DEMUXER)               += vocdec.o voc.o
 OBJS-$(CONFIG_VOC_MUXER)                 += vocenc.o voc.o
@@ -158,9 +186,6 @@ OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
 
 OBJS-$(CONFIG_VHOOK)                     += framehook.o
 
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) $(EXTRALIBS)
-
 # protocols I/O
 OBJS+= avio.o aviobuf.o
 
@@ -171,8 +196,4 @@ OBJS-$(CONFIG_RTP_PROTOCOL)              += rtpproto.o
 OBJS-$(CONFIG_TCP_PROTOCOL)              += tcp.o
 OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 
-NAME=avformat
-LIBVERSION=$(LAVFVERSION)
-LIBMAJOR=$(LAVFMAJOR)
-
 include ../common.mak