diff options
author | Diego Biurrun <diego@biurrun.de> | 2007-08-30 23:11:24 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2007-08-30 23:11:24 +0000 |
commit | 1e97ce4a3149fbf45f5d10e98a3000ef88f4653a (patch) | |
tree | 5f6663bc229b605971e7b15fcc1beae056f26a3b | |
parent | d8dfda7e511b85064b1a0faa589c97043c92cffa (diff) | |
download | ffmpeg-streaming-1e97ce4a3149fbf45f5d10e98a3000ef88f4653a.zip ffmpeg-streaming-1e97ce4a3149fbf45f5d10e98a3000ef88f4653a.tar.gz |
cosmetics: Sort some lines, whitespace changes.
Originally committed as revision 10268 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/Makefile | 82 | ||||
-rw-r--r-- | libavformat/Makefile | 4 | ||||
-rw-r--r-- | libavutil/Makefile | 50 |
3 files changed, 74 insertions, 62 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f8b5c92..fb10ff5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -4,29 +4,29 @@ # include ../config.mak -CFLAGS+=-I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec - -OBJS= bitstream.o \ - utils.o \ - allcodecs.o \ - mpegvideo.o \ - jrevdct.o \ - jfdctfst.o \ - jfdctint.o\ - resample.o \ - resample2.o \ - dsputil.o \ - imgconvert.o \ - mpeg12.o mpeg12data.o \ - simple_idct.o \ - eval.o \ - error_resilience.o \ - raw.o \ - faandct.o \ - parser.o \ - opt.o \ - bitstream_filter.o \ - audioconvert.o \ +CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec + +OBJS = allcodecs.o \ + audioconvert.o \ + bitstream.o \ + bitstream_filter.o \ + dsputil.o \ + error_resilience.o \ + eval.o \ + faandct.o \ + imgconvert.o \ + jrevdct.o \ + jfdctfst.o \ + jfdctint.o\ + mpeg12.o mpeg12data.o \ + mpegvideo.o \ + opt.o \ + parser.o \ + raw.o \ + resample.o \ + resample2.o \ + simple_idct.o \ + utils.o \ 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_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o -OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o -OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o +OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_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_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o mpegaudiodata.o -OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o -OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o +OBJS-$(CONFIG_NOISE_BSF) += noise_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_W32THREADS) += w32thread.o -OBJS-$(HAVE_OS2THREADS) += os2thread.o -OBJS-$(HAVE_BEOSTHREADS) += beosthread.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_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_VP5_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_SNOW_DECODER) += i386/snowdsp_mmx.o endif 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-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ + alpha/motion_est_alpha.o \ alpha/mpegvideo_alpha.o \ alpha/simple_idct_alpha.o \ - alpha/motion_est_alpha.o \ ASM_OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha_asm.o \ alpha/motion_est_mvi_asm.o \ @@ -398,17 +398,17 @@ OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \ ps2/mpegvideo_mmi.o \ OBJS-$(ARCH_SH4) += sh4/idct_sh4.o \ - sh4/dsputil_sh4.o \ sh4/dsputil_align.o \ + sh4/dsputil_sh4.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/fft_altivec.o \ ppc/float_altivec.o \ + ppc/gmc_altivec.o \ + ppc/idct_altivec.o \ ppc/int_altivec.o \ + ppc/mpegvideo_altivec.o \ ifeq ($(HAVE_ALTIVEC),yes) OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o @@ -421,8 +421,8 @@ OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \ bfin/mpegvideo_bfin.o \ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \ - bfin/idct_bfin.o \ bfin/fdct_bfin.o \ + bfin/idct_bfin.o \ EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) @@ -457,13 +457,13 @@ apiexample: apiexample.o $(LIB) cpuid-test: i386/cputest.c $(CC) $(CFLAGS) -DTEST -o $@ $< +dct-test: dct-test.o fdctref.o $(LIB) + +fft-test: fft-test.o $(LIB) + imgresample-test: imgresample.c $(LIB) $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS) -dct-test: dct-test.o fdctref.o $(LIB) - motion-test: motion-test.o $(LIB) -fft-test: fft-test.o $(LIB) - .PHONY: tests diff --git a/libavformat/Makefile b/libavformat/Makefile index 8accc8a..84e5a23 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -4,9 +4,9 @@ # 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 diff --git a/libavutil/Makefile b/libavutil/Makefile index ffe3775..cea3cab 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -1,25 +1,37 @@ include ../config.mak -OBJS= mathematics.o \ - rational.o \ - intfloat_readwrite.o \ - crc.o \ - md5.o \ - lls.o \ - adler32.o \ - log.o \ - mem.o \ - fifo.o \ - tree.o \ - lzo.o \ - random.o \ - aes.o \ - base64.o \ - string.o \ +OBJS = adler32.o \ + aes.o \ + base64.o \ + crc.o \ + intfloat_readwrite.o \ + fifo.o \ + lls.o \ + log.o \ + lzo.o \ + mathematics.o \ + md5.o \ + mem.o \ + random.o \ + rational.o \ + string.o \ + tree.o \ -HEADERS = avutil.h common.h mathematics.h integer.h rational.h \ - intfloat_readwrite.h md5.h adler32.h log.h fifo.h lzo.h \ - random.h mem.h base64.h avstring.h +HEADERS = adler32.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 LIBVERSION=$(LAVUVERSION) |