virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

cosmetics: Sort some lines, whitespace changes.

Browse Source 
Originally committed as revision 10268 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-08-30 23:11:24 +00:00
parent d8dfda7e51
commit 1e97ce4a31
3 changed files with 74 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
libavcodec/Makefile
View File

@ -4,29 +4,29 @@
# #
include ../config.mak include ../config.mak
CFLAGS+=-I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
OBJS= bitstream.o \ OBJS = allcodecs.o \
utils.o \ audioconvert.o \
allcodecs.o \ bitstream.o \
mpegvideo.o \ bitstream_filter.o \
jrevdct.o \ dsputil.o \
jfdctfst.o \ error_resilience.o \
jfdctint.o\ eval.o \
resample.o \ faandct.o \
resample2.o \ imgconvert.o \
dsputil.o \ jrevdct.o \
imgconvert.o \ jfdctfst.o \
mpeg12.o mpeg12data.o \ jfdctint.o\
simple_idct.o \ mpeg12.o mpeg12data.o \
eval.o \ mpegvideo.o \
error_resilience.o \ opt.o \
raw.o \ parser.o \
faandct.o \ raw.o \
parser.o \ resample.o \
opt.o \ resample2.o \
bitstream_filter.o \ simple_idct.o \
audioconvert.o \ utils.o \
HEADERS = avcodec.h opt.h HEADERS = avcodec.h opt.h
@ -320,17 +320,17 @@ OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o
OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o
OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o
OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o
OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o
OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF) += mp3_header_compress_bsf.o OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF) += mp3_header_compress_bsf.o
OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o mpegaudiodata.o OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o mpegaudiodata.o
OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o
OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o
OBJS-$(HAVE_BEOSTHREADS) += beosthread.o
OBJS-$(HAVE_OS2THREADS) += os2thread.o
OBJS-$(HAVE_PTHREADS) += pthread.o OBJS-$(HAVE_PTHREADS) += pthread.o
OBJS-$(HAVE_W32THREADS) += w32thread.o OBJS-$(HAVE_W32THREADS) += w32thread.o
OBJS-$(HAVE_OS2THREADS) += os2thread.o
OBJS-$(HAVE_BEOSTHREADS) += beosthread.o
OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
@ -353,11 +353,11 @@ OBJS += i386/fdct_mmx.o \
OBJS-$(CONFIG_GPL) += i386/idct_mmx.o OBJS-$(CONFIG_GPL) += i386/idct_mmx.o
OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o
OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o
OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
OBJS-$(CONFIG_VP6_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_VP6_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
OBJS-$(CONFIG_VP6F_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o OBJS-$(CONFIG_VP6F_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o
endif endif
ASM_OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ ASM_OBJS-$(ARCH_ARMV4L) += armv4l/jrevdct_arm.o \
@ -383,9 +383,9 @@ sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \ OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \
OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \
alpha/motion_est_alpha.o \
alpha/mpegvideo_alpha.o \ alpha/mpegvideo_alpha.o \
alpha/simple_idct_alpha.o \ alpha/simple_idct_alpha.o \
alpha/motion_est_alpha.o \
ASM_OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \ ASM_OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \
alpha/motion_est_mvi_asm.o \ alpha/motion_est_mvi_asm.o \
@ -398,17 +398,17 @@ OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \
ps2/mpegvideo_mmi.o \ ps2/mpegvideo_mmi.o \
OBJS-$(ARCH_SH4) += sh4/idct_sh4.o \ OBJS-$(ARCH_SH4) += sh4/idct_sh4.o \
sh4/dsputil_sh4.o \
sh4/dsputil_align.o \ sh4/dsputil_align.o \
sh4/dsputil_sh4.o \
OBJS-$(HAVE_ALTIVEC) += ppc/dsputil_altivec.o \ OBJS-$(HAVE_ALTIVEC) += ppc/dsputil_altivec.o \
ppc/mpegvideo_altivec.o \
ppc/idct_altivec.o \
ppc/fft_altivec.o \
ppc/gmc_altivec.o \
ppc/fdct_altivec.o \ ppc/fdct_altivec.o \
ppc/fft_altivec.o \
ppc/float_altivec.o \ ppc/float_altivec.o \
ppc/gmc_altivec.o \
ppc/idct_altivec.o \
ppc/int_altivec.o \ ppc/int_altivec.o \
ppc/mpegvideo_altivec.o \
ifeq ($(HAVE_ALTIVEC),yes) ifeq ($(HAVE_ALTIVEC),yes)
OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o
@ -421,8 +421,8 @@ OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \
bfin/mpegvideo_bfin.o \ bfin/mpegvideo_bfin.o \
ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \
bfin/idct_bfin.o \
bfin/fdct_bfin.o \ bfin/fdct_bfin.o \
bfin/idct_bfin.o \
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
@ -457,13 +457,13 @@ apiexample: apiexample.o $(LIB)
cpuid-test: i386/cputest.c cpuid-test: i386/cputest.c
$(CC) $(CFLAGS) -DTEST -o $@ $< $(CC) $(CFLAGS) -DTEST -o $@ $<
imgresample-test: imgresample.c $(LIB)
$(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
dct-test: dct-test.o fdctref.o $(LIB) dct-test: dct-test.o fdctref.o $(LIB)
motion-test: motion-test.o $(LIB)
fft-test: fft-test.o $(LIB) fft-test: fft-test.o $(LIB)
imgresample-test: imgresample.c $(LIB)
$(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
motion-test: motion-test.o $(LIB)
.PHONY: tests .PHONY: tests

4
libavformat/Makefile
View File

@ -4,9 +4,9 @@
# #
include ../config.mak include ../config.mak
CFLAGS+=-I$(SRC_PATH)/libavcodec CFLAGS += -I$(SRC_PATH)/libavcodec
OBJS= utils.o cutils.o os_support.o allformats.o sdp.o 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 rtp.h rtsp.h rtspcodes.h

50
libavutil/Makefile
View File

@ -1,25 +1,37 @@
include ../config.mak include ../config.mak
OBJS= mathematics.o \ OBJS = adler32.o \
rational.o \ aes.o \
intfloat_readwrite.o \ base64.o \
crc.o \ crc.o \
md5.o \ intfloat_readwrite.o \
lls.o \ fifo.o \
adler32.o \ lls.o \
log.o \ log.o \
mem.o \ lzo.o \
fifo.o \ mathematics.o \
tree.o \ md5.o \
lzo.o \ mem.o \
random.o \ random.o \
aes.o \ rational.o \
base64.o \ string.o \
string.o \ tree.o \
HEADERS = avutil.h common.h mathematics.h integer.h rational.h \ HEADERS = adler32.h \
intfloat_readwrite.h md5.h adler32.h log.h fifo.h lzo.h \ avstring.h \
random.h mem.h base64.h avstring.h avutil.h \
base64.h \
common.h \
fifo.h \
integer.h \
intfloat_readwrite.h \
log.h \
lzo.h \
mathematics.h \
md5.h \
mem.h \
random.h \
rational.h \
NAME=avutil NAME=avutil
LIBVERSION=$(LAVUVERSION) LIBVERSION=$(LAVUVERSION)