Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: patched-ffmpeg-mt/libavformat/Makefile

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 include $(SUBDIR)../config.mak 1 include $(SUBDIR)../config.mak
2 2
3 NAME = avformat 3 NAME = avformat
4 FFLIBS = avcodec avutil 4 FFLIBS = avcodec avutil
5 5
6 HEADERS = avformat.h avio.h 6 HEADERS = avformat.h avio.h
7 7
8 OBJS = allformats.o \ 8 OBJS = allformats.o \
9 cutils.o \ 9 cutils.o \
10 metadata.o \ 10 metadata.o \
11 metadata_compat.o \ 11 metadata_compat.o \
12 options.o \ 12 options.o \
13 os_support.o \ 13 os_support.o \
14 sdp.o \ 14 sdp.o \
15 seek.o \ 15 seek.o \
16 utils.o \ 16 utils.o \
17 17
18 # muxers/demuxers 18 # muxers/demuxers
19 OBJS-$(CONFIG_AAC_DEMUXER) += raw.o id3v1.o id3v2.o 19 OBJS-$(CONFIG_AAC_DEMUXER) += raw.o id3v1.o id3v2.o
20 OBJS-$(CONFIG_AC3_DEMUXER) += raw.o 20 OBJS-$(CONFIG_AC3_DEMUXER) += raw.o
21 OBJS-$(CONFIG_AC3_MUXER) += raw.o 21 OBJS-$(CONFIG_AC3_MUXER) += raw.o
22 OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o 22 OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o
23 OBJS-$(CONFIG_AEA_DEMUXER) += aea.o 23 OBJS-$(CONFIG_AEA_DEMUXER) += aea.o raw.o
24 OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o riff.o raw.o 24 OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o riff.o raw.o
25 OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o riff.o 25 OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o riff.o
26 OBJS-$(CONFIG_AMR_DEMUXER) += amr.o 26 OBJS-$(CONFIG_AMR_DEMUXER) += amr.o
27 OBJS-$(CONFIG_AMR_MUXER) += amr.o 27 OBJS-$(CONFIG_AMR_MUXER) += amr.o
28 OBJS-$(CONFIG_ANM_DEMUXER) += anm.o 28 OBJS-$(CONFIG_ANM_DEMUXER) += anm.o
29 OBJS-$(CONFIG_APC_DEMUXER) += apc.o 29 OBJS-$(CONFIG_APC_DEMUXER) += apc.o
30 OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o 30 OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o
31 OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \ 31 OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o \
32 riff.o avlanguage.o 32 riff.o avlanguage.o
33 OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o riff.o 33 OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o riff.o
34 OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o 34 OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o
35 OBJS-$(CONFIG_ASS_MUXER) += assenc.o 35 OBJS-$(CONFIG_ASS_MUXER) += assenc.o
36 OBJS-$(CONFIG_AU_DEMUXER) += au.o raw.o 36 OBJS-$(CONFIG_AU_DEMUXER) += au.o raw.o
37 OBJS-$(CONFIG_AU_MUXER) += au.o 37 OBJS-$(CONFIG_AU_MUXER) += au.o
38 OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o 38 OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o riff.o avi.o
39 OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o 39 OBJS-$(CONFIG_AVI_MUXER) += avienc.o riff.o avi.o
40 OBJS-$(CONFIG_AVISYNTH) += avisynth.o 40 OBJS-$(CONFIG_AVISYNTH) += avisynth.o
41 OBJS-$(CONFIG_AVM2_MUXER) += swfenc.o 41 OBJS-$(CONFIG_AVM2_MUXER) += swfenc.o
42 OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o 42 OBJS-$(CONFIG_AVS_DEMUXER) += avs.o vocdec.o voc.o
43 OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o 43 OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
44 OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o 44 OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o
45 OBJS-$(CONFIG_BINK_DEMUXER) += bink.o 45 OBJS-$(CONFIG_BINK_DEMUXER) += bink.o
46 OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o 46 OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o
47 OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o riff.o isom.o 47 OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o riff.o isom.o
48 OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += raw.o 48 OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += raw.o
49 OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o 49 OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o 119 OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o
120 OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o 120 OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o
121 OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpegenc.o 121 OBJS-$(CONFIG_MPEG1VCD_MUXER) += mpegenc.o
122 OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpegenc.o 122 OBJS-$(CONFIG_MPEG2DVD_MUXER) += mpegenc.o
123 OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpegenc.o 123 OBJS-$(CONFIG_MPEG2VOB_MUXER) += mpegenc.o
124 OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpegenc.o 124 OBJS-$(CONFIG_MPEG2SVCD_MUXER) += mpegenc.o
125 OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += raw.o 125 OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += raw.o
126 OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.o 126 OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.o
127 OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o 127 OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o
128 OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o 128 OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o
129 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o 129 OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o adtsenc.o
130 OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.o 130 OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.o
131 OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o 131 OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
132 OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o 132 OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o
133 OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o 133 OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
134 OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o 134 OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o
135 OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o 135 OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o
136 OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o audiointerleave.o 136 OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o audiointerleave.o
137 OBJS-$(CONFIG_NC_DEMUXER) += ncdec.o 137 OBJS-$(CONFIG_NC_DEMUXER) += ncdec.o
138 OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o 138 OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o
139 OBJS-$(CONFIG_NULL_MUXER) += raw.o 139 OBJS-$(CONFIG_NULL_MUXER) += raw.o
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o 203 OBJS-$(CONFIG_RPL_DEMUXER) += rpl.o
204 OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ 204 OBJS-$(CONFIG_RTP_MUXER) += rtp.o \
205 rtpenc_aac.o \ 205 rtpenc_aac.o \
206 rtpenc_amr.o \ 206 rtpenc_amr.o \
207 rtpenc_h263.o \ 207 rtpenc_h263.o \
208 rtpenc_mpv.o \ 208 rtpenc_mpv.o \
209 rtpenc.o \ 209 rtpenc.o \
210 rtpenc_h264.o \ 210 rtpenc_h264.o \
211 avc.o 211 avc.o
212 OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o 212 OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o
213 OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o
213 OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o \ 214 OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o \
214 rdt.o \ 215 rdt.o \
215 rtp.o \ 216 rtp.o \
216 rtpdec.o \ 217 rtpdec.o \
218 rtpdec_amr.o \
219 rtpdec_asf.o \
217 rtpdec_h263.o \ 220 rtpdec_h263.o \
218 rtp_asf.o \ 221 rtpdec_h264.o \
219 rtp_h264.o \ 222 rtpdec_vorbis.o
220 rtp_vorbis.o
221 OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o 223 OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o
222 OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o 224 OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o
223 OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o 225 OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o
224 OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o 226 OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o
225 OBJS-$(CONFIG_SOL_DEMUXER) += sol.o raw.o 227 OBJS-$(CONFIG_SOL_DEMUXER) += sol.o raw.o
226 OBJS-$(CONFIG_SOX_DEMUXER) += soxdec.o raw.o 228 OBJS-$(CONFIG_SOX_DEMUXER) += soxdec.o raw.o
227 OBJS-$(CONFIG_SOX_MUXER) += soxenc.o 229 OBJS-$(CONFIG_SOX_MUXER) += soxenc.o
228 OBJS-$(CONFIG_SPDIF_MUXER) += spdif.o 230 OBJS-$(CONFIG_SPDIF_MUXER) += spdif.o
229 OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o 231 OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o
230 OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o 232 OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o
(...skipping 11 matching lines...) Expand all
242 OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o 244 OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o
243 OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o 245 OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o
244 OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o 246 OBJS-$(CONFIG_VOC_MUXER) += vocenc.o voc.o
245 OBJS-$(CONFIG_VQF_DEMUXER) += vqf.o 247 OBJS-$(CONFIG_VQF_DEMUXER) += vqf.o
246 OBJS-$(CONFIG_W64_DEMUXER) += wav.o riff.o raw.o 248 OBJS-$(CONFIG_W64_DEMUXER) += wav.o riff.o raw.o
247 OBJS-$(CONFIG_WAV_DEMUXER) += wav.o riff.o raw.o 249 OBJS-$(CONFIG_WAV_DEMUXER) += wav.o riff.o raw.o
248 OBJS-$(CONFIG_WAV_MUXER) += wav.o riff.o 250 OBJS-$(CONFIG_WAV_MUXER) += wav.o riff.o
249 OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o 251 OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o
250 OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o 252 OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o
251 OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o 253 OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o
252 OBJS-$(CONFIG_WV_DEMUXER) += wv.o 254 OBJS-$(CONFIG_WV_DEMUXER) += wv.o apetag.o id3v1.o
253 OBJS-$(CONFIG_XA_DEMUXER) += xa.o 255 OBJS-$(CONFIG_XA_DEMUXER) += xa.o
254 OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o 256 OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o
255 OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o 257 OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o
256 258
257 # external libraries 259 # external libraries
258 OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o 260 OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o riff.o
259 OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o 261 OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o
260 262
261 # protocols I/O 263 # protocols I/O
262 OBJS+= avio.o aviobuf.o 264 OBJS+= avio.o aviobuf.o
263 265
264 OBJS-$(CONFIG_FILE_PROTOCOL) += file.o 266 OBJS-$(CONFIG_FILE_PROTOCOL) += file.o
265 OBJS-$(CONFIG_GOPHER_PROTOCOL) += gopher.o 267 OBJS-$(CONFIG_GOPHER_PROTOCOL) += gopher.o
266 OBJS-$(CONFIG_HTTP_PROTOCOL) += http.o 268 OBJS-$(CONFIG_HTTP_PROTOCOL) += http.o
267 OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o 269 OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o
268 OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o 270 OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o
269 OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o 271 OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o
270 OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o 272 OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
271 OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o 273 OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
274 OBJS-$(CONFIG_CONCAT_PROTOCOL) += concat.o
272 275
273 # libavdevice dependencies 276 # libavdevice dependencies
274 OBJS-$(CONFIG_JACK_INDEV) += timefilter.o 277 OBJS-$(CONFIG_JACK_INDEV) += timefilter.o
275 278
276 EXAMPLES = output 279 EXAMPLES = output
277 TESTPROGS = timefilter 280 TESTPROGS = timefilter
278 281
279 include $(SUBDIR)../subdir.mak 282 include $(SUBDIR)../subdir.mak
280 283
281 $(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale 284 $(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698