[MPlayer-cvslog] r22549 - in trunk: Gui/Makefile dvdread/Makefile input/Makefile liba52/Makefile libaf/Makefile libao2/Makefile libass/Makefile libdvdcss/Makefile libfaad2/Makefile libmenu/Makefile libmpcodecs/Makefile libmpdemux/Makefile libmpeg2/Makefile libvo/Makefile loader/Makefile mp3lib/Makefile osdep/Makefile stream/Makefile tremor/Makefile

diego subversion at mplayerhq.hu
Tue Mar 13 22:55:24 CET 2007


Author: diego
Date: Tue Mar 13 22:55:23 2007
New Revision: 22549

Modified:
   trunk/Gui/Makefile
   trunk/dvdread/Makefile
   trunk/input/Makefile
   trunk/liba52/Makefile
   trunk/libaf/Makefile
   trunk/libao2/Makefile
   trunk/libass/Makefile
   trunk/libdvdcss/Makefile
   trunk/libfaad2/Makefile
   trunk/libmenu/Makefile
   trunk/libmpcodecs/Makefile
   trunk/libmpdemux/Makefile
   trunk/libmpeg2/Makefile
   trunk/libvo/Makefile
   trunk/loader/Makefile
   trunk/mp3lib/Makefile
   trunk/osdep/Makefile
   trunk/stream/Makefile
   trunk/tremor/Makefile

Log:
cosmetics: Fix indentation, reorder some lines for consistency.


Modified: trunk/Gui/Makefile
==============================================================================
--- trunk/Gui/Makefile	(original)
+++ trunk/Gui/Makefile	Tue Mar 13 22:55:23 2007
@@ -9,49 +9,48 @@ CFLAGS-$(CONFIG_LIBAVUTIL)   += -I../lib
 
 ifeq ($(TARGET_WIN32),yes)
 SRCS_MPLAYER = win32/dialogs.c \
-       win32/gui.c \
-       win32/interface.c \
-       win32/playlist.c \
-       win32/preferences.c \
-       win32/skinload.c \
-       win32/widgetrender.c \
-       win32/wincfg.c \
+               win32/gui.c \
+               win32/interface.c \
+               win32/playlist.c \
+               win32/preferences.c \
+               win32/skinload.c \
+               win32/widgetrender.c \
+               win32/wincfg.c \
 
 else
 SRCS_MPLAYER = wm/ws.c \
-       wm/wsxdnd.c \
-       app.c \
-       interface.c \
-       cfg.c \
-       bitmap.c \
-       skin/skin.c \
-       skin/font.c \
-       skin/cut.c \
-       mplayer/widgets.c \
-       mplayer/play.c \
-       mplayer/mw.c \
-       mplayer/sw.c \
-       mplayer/menu.c \
-       mplayer/pb.c \
-       mplayer/common.c \
-       mplayer/gtk/menu.c \
-       mplayer/gtk/mb.c \
-       mplayer/gtk/about.c \
-       mplayer/gtk/pl.c \
-       mplayer/gtk/sb.c \
-       mplayer/gtk/fs.c \
-       mplayer/gtk/opts.c \
-       mplayer/gtk/url.c \
-       mplayer/gtk/eq.c \
-       mplayer/gtk/common.c \
+               wm/wsxdnd.c \
+               app.c \
+               interface.c \
+               cfg.c \
+               bitmap.c \
+               skin/skin.c \
+               skin/font.c \
+               skin/cut.c \
+               mplayer/widgets.c \
+               mplayer/play.c \
+               mplayer/mw.c \
+               mplayer/sw.c \
+               mplayer/menu.c \
+               mplayer/pb.c \
+               mplayer/common.c \
+               mplayer/gtk/menu.c \
+               mplayer/gtk/mb.c \
+               mplayer/gtk/about.c \
+               mplayer/gtk/pl.c \
+               mplayer/gtk/sb.c \
+               mplayer/gtk/fs.c \
+               mplayer/gtk/opts.c \
+               mplayer/gtk/url.c \
+               mplayer/gtk/eq.c \
+               mplayer/gtk/common.c \
 
 endif
 
 include ../mpcommon.mak
 
 clean::
-	rm -f mplayer/*.o mplayer/*~ \
-              mplayer/gtk/*.o mplayer/gtk/*~ \
+	rm -f mplayer/*.o mplayer/*~ mplayer/gtk/*.o mplayer/gtk/*~ \
               skin/*.o skin/*~ \
               wm/*.o wm/*~ \
               win32/*.o win32/*~ \

Modified: trunk/dvdread/Makefile
==============================================================================
--- trunk/dvdread/Makefile	(original)
+++ trunk/dvdread/Makefile	Tue Mar 13 22:55:23 2007
@@ -3,13 +3,13 @@ include ../config.mak
 LIBNAME_COMMON = libdvdread.a
 
 SRCS_COMMON = dvd_input.c \
-       dvd_reader.c \
-       dvd_udf.c \
-       ifo_print.c \
-       ifo_read.c \
-       nav_print.c \
-       nav_read.c \
-       md5.c \
+              dvd_reader.c \
+              dvd_udf.c \
+              ifo_print.c \
+              ifo_read.c \
+              nav_print.c \
+              nav_read.c \
+              md5.c \
 
 CFLAGS= -D__USE_UNIX98 -D_GNU_SOURCE -DSTDC_HEADERS \
 	-DHAVE_LIMITS_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

Modified: trunk/input/Makefile
==============================================================================
--- trunk/input/Makefile	(original)
+++ trunk/input/Makefile	Tue Mar 13 22:55:23 2007
@@ -1,4 +1,3 @@
-
 include ../config.mak
 
 LIBNAME_MPLAYER = libinput.a

Modified: trunk/liba52/Makefile
==============================================================================
--- trunk/liba52/Makefile	(original)
+++ trunk/liba52/Makefile	Tue Mar 13 22:55:23 2007
@@ -1,15 +1,14 @@
+include ../config.mak
 
 LIBNAME_COMMON = liba52.a
 
-include ../config.mak
-
 SRCS_COMMON = crc.c \
-          resample.c \
-          bit_allocate.c \
-          bitstream.c \
-          downmix.c \
-          imdct.c \
-          parse.c \
+              resample.c \
+              bit_allocate.c \
+              bitstream.c \
+              downmix.c \
+              imdct.c \
+              parse.c \
 
 include ../mpcommon.mak
 

Modified: trunk/libaf/Makefile
==============================================================================
--- trunk/libaf/Makefile	(original)
+++ trunk/libaf/Makefile	Tue Mar 13 22:55:23 2007
@@ -3,31 +3,31 @@ include ../config.mak
 LIBNAME_COMMON = libaf.a
 
 SRCS_COMMON = af.c \
-     af_center.c \
-     af_channels.c \
-     af_comp.c \
-     af_delay.c \
-     af_dummy.c \
-     af_equalizer.c \
-     af_export.c \
-     af_extrastereo.c \
-     af_format.c \
-     af_gate.c \
-     af_hrtf.c \
-     af_karaoke.c \
-     af_pan.c \
-     af_resample.c \
-     af_sinesuppress.c \
-     af_sub.c \
-     af_surround.c \
-     af_sweep.c \
-     af_tools.c \
-     af_volnorm.c \
-     af_volume.c \
-     filter.c \
-     format.c \
-     window.c \
-     $(AF_SRCS) \
+              af_center.c \
+              af_channels.c \
+              af_comp.c \
+              af_delay.c \
+              af_dummy.c \
+              af_equalizer.c \
+              af_export.c \
+              af_extrastereo.c \
+              af_format.c \
+              af_gate.c \
+              af_hrtf.c \
+              af_karaoke.c \
+              af_pan.c \
+              af_resample.c \
+              af_sinesuppress.c \
+              af_sub.c \
+              af_surround.c \
+              af_sweep.c \
+              af_tools.c \
+              af_volnorm.c \
+              af_volume.c \
+              filter.c \
+              format.c \
+              window.c \
+              $(AF_SRCS) \
 
 SRCS_COMMON-$(CONFIG_LIBAVCODEC)    += af_lavcresample.c
 SRCS_COMMON-$(CONFIG_LIBAVCODEC_SO) += af_lavcresample.c

Modified: trunk/libao2/Makefile
==============================================================================
--- trunk/libao2/Makefile	(original)
+++ trunk/libao2/Makefile	Tue Mar 13 22:55:23 2007
@@ -3,9 +3,9 @@ include ../config.mak
 LIBNAME_MPLAYER = libao2.a
 
 SRCS_MPLAYER = audio_out.c \
-     ao_mpegpes.c \
-     ao_null.c \
-     ao_pcm.c \
-     $(AO_SRCS) \
+               ao_mpegpes.c \
+               ao_null.c \
+               ao_pcm.c \
+               $(AO_SRCS) \
 
 include ../mpcommon.mak

Modified: trunk/libass/Makefile
==============================================================================
--- trunk/libass/Makefile	(original)
+++ trunk/libass/Makefile	Tue Mar 13 22:55:23 2007
@@ -1,17 +1,16 @@
-
 include ../config.mak
 
 LIBNAME_COMMON = libass.a
 
 SRCS_COMMON = ass.c \
-       ass_cache.c \
-       ass_fontconfig.c \
-       ass_render.c \
-       ass_utils.c \
-       ass_mp.c \
-       ass_bitmap.c \
-       ass_library.c \
-       ass_font.c \
+              ass_cache.c \
+              ass_fontconfig.c \
+              ass_render.c \
+              ass_utils.c \
+              ass_mp.c \
+              ass_bitmap.c \
+              ass_library.c \
+              ass_font.c \
 
 CFLAGS  = -I../libmpcodecs
 

Modified: trunk/libdvdcss/Makefile
==============================================================================
--- trunk/libdvdcss/Makefile	(original)
+++ trunk/libdvdcss/Makefile	Tue Mar 13 22:55:23 2007
@@ -3,11 +3,11 @@ include ../config.mak
 LIBNAME_COMMON = libdvdcss.a
 
 SRCS_COMMON = css.c \
-       device.c \
-       error.c \
-       ioctl.c \
-       libdvdcss.c \
-       #bsdi_ioctl \
+              device.c \
+              error.c \
+              ioctl.c \
+              libdvdcss.c \
+              #bsdi_ioctl \
 
 CFLAGS= -D__USE_UNIX98 -D_GNU_SOURCE \
 	-DHAVE_LIMITS_H -DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \

Modified: trunk/libfaad2/Makefile
==============================================================================
--- trunk/libfaad2/Makefile	(original)
+++ trunk/libfaad2/Makefile	Tue Mar 13 22:55:23 2007
@@ -3,43 +3,43 @@ include ../config.mak
 LIBNAME_COMMON = libfaad2.a
 
 SRCS_COMMON = bits.c \
-          cfft.c \
-          common.c \
-          decoder.c \
-          drc.c \
-          drm_dec.c \
-          error.c \
-          filtbank.c \
-          hcr.c \
-          huffman.c \
-          ic_predict.c \
-          is.c \
-          lt_predict.c \
-          mdct.c \
-          mp4.c \
-          ms.c \
-          output.c \
-          pns.c \
-          ps_dec.c \
-          ps_syntax.c  \
-          pulse.c \
-          rvlc.c \
-          sbr_dct.c \
-          sbr_dec.c \
-          sbr_e_nf.c \
-          sbr_fbt.c \
-          sbr_hfadj.c \
-          sbr_hfgen.c \
-          sbr_huff.c \
-          sbr_qmf.c \
-          sbr_syntax.c \
-          sbr_tf_grid.c \
-          specrec.c \
-          ssr.c \
-          ssr_fb.c \
-          ssr_ipqf.c \
-          syntax.c \
-          tns.c \
+              cfft.c \
+              common.c \
+              decoder.c \
+              drc.c \
+              drm_dec.c \
+              error.c \
+              filtbank.c \
+              hcr.c \
+              huffman.c \
+              ic_predict.c \
+              is.c \
+              lt_predict.c \
+              mdct.c \
+              mp4.c \
+              ms.c \
+              output.c \
+              pns.c \
+              ps_dec.c \
+              ps_syntax.c  \
+              pulse.c \
+              rvlc.c \
+              sbr_dct.c \
+              sbr_dec.c \
+              sbr_e_nf.c \
+              sbr_fbt.c \
+              sbr_hfadj.c \
+              sbr_hfgen.c \
+              sbr_huff.c \
+              sbr_qmf.c \
+              sbr_syntax.c \
+              sbr_tf_grid.c \
+              specrec.c \
+              ssr.c \
+              ssr_fb.c \
+              ssr_ipqf.c \
+              syntax.c \
+              tns.c \
 
 CFLAGS  = -D_GNU_SOURCE
 

Modified: trunk/libmenu/Makefile
==============================================================================
--- trunk/libmenu/Makefile	(original)
+++ trunk/libmenu/Makefile	Tue Mar 13 22:55:23 2007
@@ -1,17 +1,16 @@
-
 include ../config.mak
 
 LIBNAME_MPLAYER = libmenu.a
 
 SRCS_MPLAYER = menu.c \
-      vf_menu.c \
-      menu_cmdlist.c  \
-      menu_pt.c \
-      menu_list.c  \
-      menu_filesel.c \
-      menu_txt.c \
-      menu_console.c \
-      menu_param.c \
+               vf_menu.c \
+               menu_cmdlist.c  \
+               menu_pt.c \
+               menu_list.c  \
+               menu_filesel.c \
+               menu_txt.c \
+               menu_console.c \
+               menu_param.c \
 
 SRCS_MPLAYER-$(DVBIN) += menu_dvbin.c
 

Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Tue Mar 13 22:55:23 2007
@@ -1,108 +1,107 @@
-
 include ../config.mak
 
 LIBNAME_COMMON   = libmpcodecs.a
 LIBNAME_MENCODER = libmpencoders.a
 
 SRCS_COMMON = native/nuppelvideo.c \
-       native/RTjpegN.c \
-       native/xa_gsm.c \
-       img_format.c \
-       dec_audio.c \
-       ad.c \
-       ad_alaw.c \
-       ad_dk3adpcm.c \
-       ad_dvdpcm.c \
-       ad_hwac3.c \
-       ad_hwmpa.c \
-       ad_imaadpcm.c \
-       ad_msadpcm.c \
-       ad_msgsm.c \
-       ad_pcm.c \
-       dec_video.c \
-       vd.c \
-       vd_hmblck.c \
-       vd_lzo.c \
-       vd_mpegpes.c \
-       vd_mtga.c \
-       vd_null.c \
-       vd_nuv.c \
-       vd_raw.c \
-       vd_sgi.c \
-       vf.c \
-       pullup.c \
-       vf_1bpp.c \
-       vf_2xsai.c \
-       vf_blackframe.c \
-       vf_bmovl.c \
-       vf_boxblur.c \
-       vf_crop.c \
-       vf_cropdetect.c \
-       vf_decimate.c \
-       vf_delogo.c \
-       vf_denoise3d.c \
-       vf_detc.c \
-       vf_dint.c \
-       vf_divtc.c \
-       vf_down3dright.c \
-       vf_dsize.c \
-       vf_dvbscale.c \
-       vf_eq2.c \
-       vf_eq.c \
-       vf_expand.c \
-       vf_field.c \
-       vf_fil.c \
-       vf_filmdint.c \
-       vf_flip.c \
-       vf_format.c \
-       vf_framestep.c \
-       vf_halfpack.c \
-       vf_harddup.c \
-       vf_hqdn3d.c \
-       vf_hue.c \
-       vf_il.c \
-       vf_ilpack.c \
-       vf_ivtc.c \
-       vf_kerndeint.c \
-       vf_mirror.c \
-       vf_noformat.c \
-       vf_noise.c \
-       vf_palette.c \
-       vf_perspective.c \
-       vf_phase.c \
-       vf_pp7.c \
-       vf_pullup.c \
-       vf_rectangle.c \
-       vf_remove_logo.c \
-       vf_rgb2bgr.c \
-       vf_rgbtest.c \
-       vf_rotate.c \
-       vf_sab.c \
-       vf_scale.c \
-       vf_smartblur.c \
-       vf_softpulldown.c \
-       vf_softskip.c \
-       vf_swapuv.c \
-       vf_telecine.c \
-       vf_test.c \
-       vf_tfields.c \
-       vf_tile.c \
-       vf_tinterlace.c \
-       vf_unsharp.c \
-       vf_vo.c \
-       vf_yadif.c \
-       vf_yuvcsp.c \
-       vf_yuy2.c \
-       vf_yvu9.c \
+              native/RTjpegN.c \
+              native/xa_gsm.c \
+              img_format.c \
+              dec_audio.c \
+              ad.c \
+              ad_alaw.c \
+              ad_dk3adpcm.c \
+              ad_dvdpcm.c \
+              ad_hwac3.c \
+              ad_hwmpa.c \
+              ad_imaadpcm.c \
+              ad_msadpcm.c \
+              ad_msgsm.c \
+              ad_pcm.c \
+              dec_video.c \
+              vd.c \
+              vd_hmblck.c \
+              vd_lzo.c \
+              vd_mpegpes.c \
+              vd_mtga.c \
+              vd_null.c \
+              vd_nuv.c \
+              vd_raw.c \
+              vd_sgi.c \
+              vf.c \
+              pullup.c \
+              vf_1bpp.c \
+              vf_2xsai.c \
+              vf_blackframe.c \
+              vf_bmovl.c \
+              vf_boxblur.c \
+              vf_crop.c \
+              vf_cropdetect.c \
+              vf_decimate.c \
+              vf_delogo.c \
+              vf_denoise3d.c \
+              vf_detc.c \
+              vf_dint.c \
+              vf_divtc.c \
+              vf_down3dright.c \
+              vf_dsize.c \
+              vf_dvbscale.c \
+              vf_eq2.c \
+              vf_eq.c \
+              vf_expand.c \
+              vf_field.c \
+              vf_fil.c \
+              vf_filmdint.c \
+              vf_flip.c \
+              vf_format.c \
+              vf_framestep.c \
+              vf_halfpack.c \
+              vf_harddup.c \
+              vf_hqdn3d.c \
+              vf_hue.c \
+              vf_il.c \
+              vf_ilpack.c \
+              vf_ivtc.c \
+              vf_kerndeint.c \
+              vf_mirror.c \
+              vf_noformat.c \
+              vf_noise.c \
+              vf_palette.c \
+              vf_perspective.c \
+              vf_phase.c \
+              vf_pp7.c \
+              vf_pullup.c \
+              vf_rectangle.c \
+              vf_remove_logo.c \
+              vf_rgb2bgr.c \
+              vf_rgbtest.c \
+              vf_rotate.c \
+              vf_sab.c \
+              vf_scale.c \
+              vf_smartblur.c \
+              vf_softpulldown.c \
+              vf_softskip.c \
+              vf_swapuv.c \
+              vf_telecine.c \
+              vf_test.c \
+              vf_tfields.c \
+              vf_tile.c \
+              vf_tinterlace.c \
+              vf_unsharp.c \
+              vf_vo.c \
+              vf_yadif.c \
+              vf_yuvcsp.c \
+              vf_yuy2.c \
+              vf_yvu9.c \
 
 SRCS_COMMON-$(CONFIG_ASS)            += vf_ass.c
 # These filters use private headers and do not work with shared libavcodec.
 SRCS_COMMON-$(CONFIG_LIBAVCODEC)     += vf_fspp.c \
-                                 vf_geq.c \
-                                 vf_mcdeint.c \
-                                 vf_qp.c \
-                                 vf_spp.c \
-                                 vf_uspp.c \
+                                        vf_geq.c \
+                                        vf_mcdeint.c \
+                                        vf_qp.c \
+                                        vf_spp.c \
+                                        vf_uspp.c \
 
 SRCS_COMMON-$(CONFIG_LIBAVCODEC)     += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c
 SRCS_COMMON-$(CONFIG_LIBAVCODEC_SO)  += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c
@@ -123,16 +122,16 @@ SRCS_COMMON-$(QTX_CODECS)            += 
 SRCS_COMMON-$(REAL_CODECS)           += ad_realaud.c vd_realvid.c
 SRCS_COMMON-$(SPEEX)                 += ad_speex.c
 SRCS_COMMON-$(WIN32DLL)              += ad_acm.c ad_dmo.c ad_dshow.c ad_twin.c \
-                                 vd_dmo.c vd_dshow.c vd_vfw.c vd_vfwex.c
+                                        vd_dmo.c vd_dshow.c vd_vfw.c vd_vfwex.c
 SRCS_COMMON-$(XANIM_CODECS)          += vd_xanim.c
 SRCS_COMMON-$(XVID4)                 += vd_xvid4.c
 SRCS_COMMON-$(ZORAN)                 += vd_zrmjpeg.c vf_zrmjpeg.c
 
 
-SRCS_MENCODER=ae.c \
-             ae_pcm.c \
-             ve.c \
-             ve_raw.c \
+SRCS_MENCODER = ae.c \
+                ae_pcm.c \
+                ve.c \
+                ve_raw.c \
 
 SRCS_MENCODER-$(CONFIG_LIBAVCODEC)    += ae_lavc.c ve_lavc.c
 SRCS_MENCODER-$(CONFIG_LIBAVCODEC_SO) += ae_lavc.c ve_lavc.c
@@ -160,4 +159,3 @@ include ../mpcommon.mak
 
 clean::
 	rm -f native/*.o native/*.a native/*~
-

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Tue Mar 13 22:55:23 2007
@@ -1,50 +1,49 @@
-
 include ../config.mak
 
 LIBNAME_COMMON   = libmpdemux.a
 LIBNAME_MENCODER = libmpmux.a
 
-SRCS_COMMON  = asfheader.c \
-        aviheader.c \
-        aviprint.c \
-        demuxer.c \
-        demux_aac.c \
-        demux_asf.c \
-        demux_audio.c \
-        demux_avi.c \
-        demux_demuxers.c \
-        demux_film.c \
-        demux_fli.c \
-        demux_lmlm4.c \
-        demux_mf.c \
-        demux_mkv.c ebml.c \
-        demux_mov.c \
-        demux_mpg.c \
-        demux_nsv.c \
-        demux_nuv.c \
-        demux_pva.c \
-        demux_rawaudio.c \
-        demux_rawvideo.c \
-        demux_realaud.c \
-        demux_real.c \
-        demux_roq.c \
-        demux_smjpeg.c \
-        demux_ts.c \
-        demux_ty.c \
-        demux_ty_osd.c \
-        demux_viv.c \
-        demux_vqf.c \
-        demux_y4m.c \
-        extension.c \
-        mf.c \
-        mp3_hdr.c \
-        mpeg_hdr.c \
-        mpeg_packetizer.c \
-        parse_es.c \
-        parse_mp4.c \
-        video.c \
-        yuv4mpeg.c \
-        yuv4mpeg_ratio.c \
+SRCS_COMMON = asfheader.c \
+              aviheader.c \
+              aviprint.c \
+              demuxer.c \
+              demux_aac.c \
+              demux_asf.c \
+              demux_audio.c \
+              demux_avi.c \
+              demux_demuxers.c \
+              demux_film.c \
+              demux_fli.c \
+              demux_lmlm4.c \
+              demux_mf.c \
+              demux_mkv.c ebml.c \
+              demux_mov.c \
+              demux_mpg.c \
+              demux_nsv.c \
+              demux_nuv.c \
+              demux_pva.c \
+              demux_rawaudio.c \
+              demux_rawvideo.c \
+              demux_realaud.c \
+              demux_real.c \
+              demux_roq.c \
+              demux_smjpeg.c \
+              demux_ts.c \
+              demux_ty.c \
+              demux_ty_osd.c \
+              demux_viv.c \
+              demux_vqf.c \
+              demux_y4m.c \
+              extension.c \
+              mf.c \
+              mp3_hdr.c \
+              mpeg_hdr.c \
+              mpeg_packetizer.c \
+              parse_es.c \
+              parse_mp4.c \
+              video.c \
+              yuv4mpeg.c \
+              yuv4mpeg_ratio.c \
 
 SRCS_COMMON-$(CONFIG_LIBAVFORMAT)      += demux_lavf.c
 SRCS_COMMON-$(CONFIG_LIBAVFORMAT_SO)   += demux_lavf.c
@@ -58,10 +57,10 @@ SRCS_COMMON-$(WIN32DLL)                +
 SRCS_COMMON-$(XMMS_PLUGINS)            += demux_xmms.c
 
 SRCS_MENCODER = muxer.c \
-        muxer_avi.c \
-        muxer_mpeg.c \
-        muxer_rawaudio.c \
-        muxer_rawvideo.c \
+                muxer_avi.c \
+                muxer_mpeg.c \
+                muxer_rawaudio.c \
+                muxer_rawvideo.c \
 
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT)     += muxer_lavf.c
 SRCS_MENCODER-$(CONFIG_LIBAVFORMAT_SO)  += muxer_lavf.c

Modified: trunk/libmpeg2/Makefile
==============================================================================
--- trunk/libmpeg2/Makefile	(original)
+++ trunk/libmpeg2/Makefile	Tue Mar 13 22:55:23 2007
@@ -3,13 +3,13 @@ include ../config.mak
 LIBNAME_COMMON = libmpeg2.a
 
 SRCS_COMMON = alloc.c \
-	  cpu_accel.c\
-	  cpu_state.c \
-	  decode.c \
-	  header.c \
-	  idct.c \
-	  motion_comp.c \
-	  slice.c \
+	      cpu_accel.c\
+	      cpu_state.c \
+	      decode.c \
+	      header.c \
+	      idct.c \
+	      motion_comp.c \
+	      slice.c \
 
 SRCS_COMMON-$(TARGET_MMX)        += idct_mmx.c motion_comp_mmx.c
 SRCS_COMMON-$(TARGET_ALTIVEC)    += motion_comp_altivec.c idct_altivec.c

Modified: trunk/libvo/Makefile
==============================================================================
--- trunk/libvo/Makefile	(original)
+++ trunk/libvo/Makefile	Tue Mar 13 22:55:23 2007
@@ -1,24 +1,23 @@
-
 include ../config.mak
 
 LIBNAME_COMMON  = libosd.a
 LIBNAME_MPLAYER = libvo.a
 
 SRCS_MPLAYER = aspect.c \
-     geometry.c \
-     spuenc.c \
-     video_out.c \
-     vo_mpegpes.c \
-     vo_null.c \
-     vo_yuv4mpeg.c \
-     $(VO_SRCS) \
+               geometry.c \
+               spuenc.c \
+               video_out.c \
+               vo_mpegpes.c \
+               vo_null.c \
+               vo_yuv4mpeg.c \
+               $(VO_SRCS) \
 
 SRCS_MPLAYER-$(EXTERNAL_VIDIX) +=  vosub_vidix.c
 SRCS_MPLAYER-$(VIDIX)          +=  vosub_vidix.c
 
 SRCS_COMMON = aclib.c \
-        osd.c \
-        sub.c \
+              osd.c \
+              sub.c \
 
 SRCS_COMMON-$(BITMAP_FONT) +=  font_load.c
 SRCS_COMMON-$(FREETYPE)    +=  font_load_ft.c

Modified: trunk/loader/Makefile
==============================================================================
--- trunk/loader/Makefile	(original)
+++ trunk/loader/Makefile	Tue Mar 13 22:55:23 2007
@@ -8,7 +8,7 @@ CFLAGS= -Idshow -DMPLAYER -D__WINE__ -DN
 SRCS_COMMON  = driver.c afl.c vfl.c
 ifneq ($(TARGET_WIN32),yes)
 SRCS_COMMON += ldt_keeper.c pe_image.c module.c ext.c win32.c \
-       pe_resource.c resource.c registry.c elfdll.c
+               pe_resource.c resource.c registry.c elfdll.c
 # QTX emulation is not supported in Darwin
 ifneq ($(TARGET_OS),Darwin)
 SRCS_COMMON += wrapper.S
@@ -16,19 +16,19 @@ endif
 endif
 
 SRCS_COMMON += dshow/DS_AudioDecoder.c \
-       dshow/DS_Filter.c \
-       dshow/DS_VideoDecoder.c \
-       dshow/allocator.c \
-       dshow/mediatype.c \
-       dshow/cmediasample.c \
-       dshow/guids.c \
-       dshow/inputpin.c \
-       dshow/outputpin.c \
-       dmo/DMO_AudioDecoder.c \
-       dmo/DMO_VideoDecoder.c   \
-       dmo/buffer.c   \
-       dmo/dmo.c  \
-       dmo/dmo_guids.c \
+               dshow/DS_Filter.c \
+               dshow/DS_VideoDecoder.c \
+               dshow/allocator.c \
+               dshow/mediatype.c \
+               dshow/cmediasample.c \
+               dshow/guids.c \
+               dshow/inputpin.c \
+               dshow/outputpin.c \
+               dmo/DMO_AudioDecoder.c \
+               dmo/DMO_VideoDecoder.c   \
+               dmo/buffer.c   \
+               dmo/dmo.c  \
+               dmo/dmo_guids.c \
 
 include ../mpcommon.mak
 

Modified: trunk/mp3lib/Makefile
==============================================================================
--- trunk/mp3lib/Makefile	(original)
+++ trunk/mp3lib/Makefile	Tue Mar 13 22:55:23 2007
@@ -1,4 +1,3 @@
-
 include ../config.mak
 
 LIBNAME_COMMON = libMP3.a
@@ -9,7 +8,7 @@ endif
 
 SRCS_COMMON = sr1.c
 ifeq ($(TARGET_ARCH_X86_32),yes)
-SRCS_COMMON += decode_i586.c
+SRCS_COMMON                   += decode_i586.c
 SRCS_COMMON-$(TARGET_MMX)     += decode_MMX.c dct64_MMX.c tabinit_MMX.c
 SRCS_COMMON-$(TARGET_3DNOW)   += dct36_3dnow.c dct64_3dnow.c
 SRCS_COMMON-$(TARGET_3DNOWEX) += dct36_k7.c dct64_k7.c

Modified: trunk/osdep/Makefile
==============================================================================
--- trunk/osdep/Makefile	(original)
+++ trunk/osdep/Makefile	Tue Mar 13 22:55:23 2007
@@ -1,4 +1,3 @@
-
 include ../config.mak
 
 LIBNAME_COMMON = libosdep.a

Modified: trunk/stream/Makefile
==============================================================================
--- trunk/stream/Makefile	(original)
+++ trunk/stream/Makefile	Tue Mar 13 22:55:23 2007
@@ -2,13 +2,13 @@ include ../config.mak
 
 LIBNAME_COMMON = stream.a
 
-SRCS_COMMON += open.c \
-        stream.c \
-        stream_cue.c \
-        stream_file.c \
-        stream_mf.c \
-        stream_null.c \
-        url.c \
+SRCS_COMMON = open.c \
+              stream.c \
+              stream_cue.c \
+              stream_file.c \
+              stream_mf.c \
+              stream_null.c \
+              url.c \
 
 SRCS_COMMON-$(CDDA)              += stream_cdda.c cdinfo.c
 SRCS_COMMON-$(CDDB)              += stream_cddb.c
@@ -18,29 +18,29 @@ SRCS_COMMON-$(DVDREAD)           += stre
 SRCS_COMMON-$(FTP)               += stream_ftp.c
 SRCS_COMMON-$(LIBSMBCLIENT)      += stream_smb.c
 SRCS_COMMON-$(MPLAYER_NETWORK)   += stream_netstream.c     \
-                             asf_mmst_streaming.c   \
-                             asf_streaming.c        \
-                             cookies.c              \
-                             http.c                 \
-                             network.c              \
-                             pnm.c                  \
-                             rtp.c                  \
-                             udp.c                  \
-                             tcp.c                  \
-                             stream_rtp.c           \
-                             stream_rtsp.c          \
-                             stream_udp.c           \
-                             freesdp/common.c       \
-                             freesdp/errorlist.c    \
-                             freesdp/parser.c       \
-                             librtsp/rtsp.c         \
-                             librtsp/rtsp_rtp.c     \
-                             librtsp/rtsp_session.c \
-                             realrtsp/asmrp.c       \
-                             realrtsp/real.c        \
-                             realrtsp/rmff.c        \
-                             realrtsp/sdpplin.c     \
-                             realrtsp/xbuffer.c     \
+                                    asf_mmst_streaming.c   \
+                                    asf_streaming.c        \
+                                    cookies.c              \
+                                    http.c                 \
+                                    network.c              \
+                                    pnm.c                  \
+                                    rtp.c                  \
+                                    udp.c                  \
+                                    tcp.c                  \
+                                    stream_rtp.c           \
+                                    stream_rtsp.c          \
+                                    stream_udp.c           \
+                                    freesdp/common.c       \
+                                    freesdp/errorlist.c    \
+                                    freesdp/parser.c       \
+                                    librtsp/rtsp.c         \
+                                    librtsp/rtsp_rtp.c     \
+                                    librtsp/rtsp_session.c \
+                                    realrtsp/asmrp.c       \
+                                    realrtsp/real.c        \
+                                    realrtsp/rmff.c        \
+                                    realrtsp/sdpplin.c     \
+                                    realrtsp/xbuffer.c     \
 
 SRCS_COMMON-$(PVR)               += stream_pvr.c
 SRCS_COMMON-$(RADIO)             += stream_radio.c

Modified: trunk/tremor/Makefile
==============================================================================
--- trunk/tremor/Makefile	(original)
+++ trunk/tremor/Makefile	Tue Mar 13 22:55:23 2007
@@ -3,19 +3,19 @@ include ../config.mak
 LIBNAME_COMMON = libvorbisidec.a
 
 SRCS_COMMON = bitwise.c \
-          block.c \
-          codebook.c \
-          floor0.c \
-          floor1.c \
-          framing.c \
-          info.c \
-          mapping0.c \
-          mdct.c \
-          registry.c \
-          res012.c \
-          sharedbook.c \
-          synthesis.c \
-          window.c \
+              block.c \
+              codebook.c \
+              floor0.c \
+              floor1.c \
+              framing.c \
+              info.c \
+              mapping0.c \
+              mdct.c \
+              registry.c \
+              res012.c \
+              sharedbook.c \
+              synthesis.c \
+              window.c \
 
 CFLAGS  = $(TREMOR_FLAGS)
 



More information about the MPlayer-cvslog mailing list