[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[353] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[353] mplayerxp
|
From: <nic...@us...> - 2012-11-13 08:37:28
|
Revision: 353
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=353&view=rev
Author: nickols_k
Date: 2012-11-13 08:37:15 +0000 (Tue, 13 Nov 2012)
Log Message:
-----------
trim trailing spaces + unexpand
Modified Paths:
--------------
mplayerxp/cfg-mplayerxp.h
mplayerxp/dump.c
mplayerxp/input2/input.c
mplayerxp/libao2/afmt.h
mplayerxp/libao2/ao_alsa9.c
mplayerxp/libao2/ao_jack.c
mplayerxp/libao2/ao_nas.c
mplayerxp/libao2/ao_null.c
mplayerxp/libao2/ao_openal.c
mplayerxp/libao2/ao_oss.c
mplayerxp/libao2/audio_out.c
mplayerxp/libao2/audio_out_internal.h
mplayerxp/libmpcodecs/ad_a52.c
mplayerxp/libmpcodecs/ad_acm.c
mplayerxp/libmpcodecs/ad_dvdpcm.c
mplayerxp/libmpcodecs/ad_faad.c
mplayerxp/libmpcodecs/ad_ffmpeg.c
mplayerxp/libmpcodecs/ad_hwac3.c
mplayerxp/libmpcodecs/ad_libdv.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_qtaudio.c
mplayerxp/libmpcodecs/ad_real.c
mplayerxp/libmpcodecs/ad_twin.c
mplayerxp/libmpcodecs/ad_vorbis.c
mplayerxp/libmpcodecs/dec_audio.h
mplayerxp/libmpcodecs/dec_video.c
mplayerxp/libmpcodecs/liba52/bitstream.c
mplayerxp/libmpcodecs/liba52/bitstream.h
mplayerxp/libmpcodecs/liba52/crc.c
mplayerxp/libmpcodecs/liba52/downmix_mmx.h
mplayerxp/libmpcodecs/liba52/imdct_mmx.h
mplayerxp/libmpcodecs/liba52/parse.c
mplayerxp/libmpcodecs/liba52/resample_c.c
mplayerxp/libmpcodecs/liba52/resample_mmx.c
mplayerxp/libmpcodecs/libdca/bitstream.c
mplayerxp/libmpcodecs/libdca/bitstream.h
mplayerxp/libmpcodecs/libdca/dca.h
mplayerxp/libmpcodecs/libdca/dca_internal.h
mplayerxp/libmpcodecs/libdca/downmix.c
mplayerxp/libmpcodecs/libdca/downmix_mmx.h
mplayerxp/libmpcodecs/libdca/parse.c
mplayerxp/libmpcodecs/libdca/resample.c
mplayerxp/libmpcodecs/libdca/resample_c.c
mplayerxp/libmpcodecs/libdca/resample_mmx.c
mplayerxp/libmpcodecs/libdca/tables_huffman.h
mplayerxp/libmpcodecs/libdca/tables_quantization.h
mplayerxp/libmpcodecs/libdca/tables_vq.h
mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.c
mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.h
mplayerxp/libmpcodecs/libnuppelvideo/lzoconf.h
mplayerxp/libmpcodecs/libnuppelvideo/minilzo.h
mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.c
mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.h
mplayerxp/libmpcodecs/vd_divx4.c
mplayerxp/libmpcodecs/vd_dmo.c
mplayerxp/libmpcodecs/vd_dshow.c
mplayerxp/libmpcodecs/vd_ffmpeg.c
mplayerxp/libmpcodecs/vd_huffyuv.c
mplayerxp/libmpcodecs/vd_nuv.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpcodecs/vd_raw.c
mplayerxp/libmpcodecs/vd_real.c
mplayerxp/libmpcodecs/vd_theora.c
mplayerxp/libmpcodecs/vd_vfw.c
mplayerxp/libmpcodecs/vd_xanim.c
mplayerxp/libmpcodecs/vd_xvid.c
mplayerxp/libmpconf/cfgparser.c
mplayerxp/libmpconf/codec-cfg.c
mplayerxp/libmpconf/m_option.c
mplayerxp/libmpconf/m_property.c
mplayerxp/libmpconf/m_property.h
mplayerxp/libmpconf/m_struct.c
mplayerxp/libmpconf/subopt-helper.c
mplayerxp/libmpdemux/asf.h
mplayerxp/libmpdemux/asf_mmst_streaming.c
mplayerxp/libmpdemux/asf_streaming.c
mplayerxp/libmpdemux/aviprint.c
mplayerxp/libmpdemux/cache2.c
mplayerxp/libmpdemux/cddb.c
mplayerxp/libmpdemux/cookies.c
mplayerxp/libmpdemux/cookies.h
mplayerxp/libmpdemux/demux_aiff.c
mplayerxp/libmpdemux/demux_asf.c
mplayerxp/libmpdemux/demux_audio.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_bmp.c
mplayerxp/libmpdemux/demux_film.c
mplayerxp/libmpdemux/demux_lavf.c
mplayerxp/libmpdemux/demux_mkv.c
mplayerxp/libmpdemux/demux_mov.c
mplayerxp/libmpdemux/demux_mpg.c
mplayerxp/libmpdemux/demux_mpxp64.c
mplayerxp/libmpdemux/demux_nsv.c
mplayerxp/libmpdemux/demux_nuv.c
mplayerxp/libmpdemux/demux_ogg.c
mplayerxp/libmpdemux/demux_pva.c
mplayerxp/libmpdemux/demux_real.c
mplayerxp/libmpdemux/demux_roq.c
mplayerxp/libmpdemux/demux_smjpeg.c
mplayerxp/libmpdemux/demux_ts.c
mplayerxp/libmpdemux/demux_ty.c
mplayerxp/libmpdemux/demux_viv.c
mplayerxp/libmpdemux/demux_vqf.c
mplayerxp/libmpdemux/demux_y4m.c
mplayerxp/libmpdemux/demuxer.c
mplayerxp/libmpdemux/freesdp/common.c
mplayerxp/libmpdemux/freesdp/common.h
mplayerxp/libmpdemux/freesdp/parser.c
mplayerxp/libmpdemux/freesdp/parser.h
mplayerxp/libmpdemux/freesdp/parserpriv.h
mplayerxp/libmpdemux/freesdp/priv.h
mplayerxp/libmpdemux/frequencies.c
mplayerxp/libmpdemux/frequencies.h
mplayerxp/libmpdemux/genres.h
mplayerxp/libmpdemux/http.c
mplayerxp/libmpdemux/http.h
mplayerxp/libmpdemux/librtsp/rtsp.c
mplayerxp/libmpdemux/librtsp/rtsp.h
mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
mplayerxp/libmpdemux/librtsp/rtsp_session.c
mplayerxp/libmpdemux/matroska.h
mplayerxp/libmpdemux/mp3_hdr.c
mplayerxp/libmpdemux/mp3_hdr.h
mplayerxp/libmpdemux/mpeg_hdr.c
mplayerxp/libmpdemux/mux_lavf.c
mplayerxp/libmpdemux/mux_mpxp64.c
mplayerxp/libmpdemux/network.c
mplayerxp/libmpdemux/network.h
mplayerxp/libmpdemux/parse_es.c
mplayerxp/libmpdemux/parse_mp4.c
mplayerxp/libmpdemux/pnm.c
mplayerxp/libmpdemux/qtpalette.h
mplayerxp/libmpdemux/realrtsp/asmrp.c
mplayerxp/libmpdemux/realrtsp/md5.c
mplayerxp/libmpdemux/realrtsp/real.c
mplayerxp/libmpdemux/realrtsp/real.h
mplayerxp/libmpdemux/realrtsp/rmff.c
mplayerxp/libmpdemux/realrtsp/rmff.h
mplayerxp/libmpdemux/realrtsp/sdpplin.c
mplayerxp/libmpdemux/realrtsp/sdpplin.h
mplayerxp/libmpdemux/realrtsp/xbuffer.c
mplayerxp/libmpdemux/realrtsp/xbuffer.h
mplayerxp/libmpdemux/rtp.c
mplayerxp/libmpdemux/s_dvdnav.c
mplayerxp/libmpdemux/s_dvdread.c
mplayerxp/libmpdemux/s_ffmpeg.c
mplayerxp/libmpdemux/s_ftp.c
mplayerxp/libmpdemux/s_network.c
mplayerxp/libmpdemux/s_rtsp.c
mplayerxp/libmpdemux/s_tv.c
mplayerxp/libmpdemux/s_udp.c
mplayerxp/libmpdemux/s_vcdnav.c
mplayerxp/libmpdemux/stream.c
mplayerxp/libmpdemux/sub_cc.c
mplayerxp/libmpdemux/sub_ty.c
mplayerxp/libmpdemux/tcp.c
mplayerxp/libmpdemux/test.c
mplayerxp/libmpdemux/tvi_bsdbt848.c
mplayerxp/libmpdemux/tvi_dummy.c
mplayerxp/libmpdemux/tvi_v4l.c
mplayerxp/libmpdemux/udp.c
mplayerxp/libmpdemux/url.c
mplayerxp/libmpdemux/url.h
mplayerxp/libmpdemux/video.c
mplayerxp/libmpdemux/yuv4mpeg.c
mplayerxp/libmpdemux/yuv4mpeg.h
mplayerxp/libmpdemux/yuv4mpeg_intern.h
mplayerxp/libmpdemux/yuv4mpeg_ratio.c
mplayerxp/libmpsub/find_sub.c
mplayerxp/libmpsub/spudec.c
mplayerxp/libmpsub/subreader.c
mplayerxp/libmpsub/vobsub.c
mplayerxp/libplaytree/asxparser.c
mplayerxp/libplaytree/playtree.c
mplayerxp/libplaytree/playtree.h
mplayerxp/libplaytree/playtreeparser.c
mplayerxp/libvo/aspect.c
mplayerxp/libvo/dri_vo.h
mplayerxp/libvo/font_load.c
mplayerxp/libvo/img_format.c
mplayerxp/libvo/jpeg_enc.c
mplayerxp/libvo/jpeg_enc.h
mplayerxp/libvo/osd.c
mplayerxp/libvo/osd_template.c
mplayerxp/libvo/screenshot.c
mplayerxp/libvo/sub.c
mplayerxp/libvo/video_out.c
mplayerxp/libvo/video_out.h
mplayerxp/libvo/video_out_internal.h
mplayerxp/libvo/videodev_mjpeg.h
mplayerxp/libvo/vo_dga.c
mplayerxp/libvo/vo_fbdev.c
mplayerxp/libvo/vo_null.c
mplayerxp/libvo/vo_opengl.c
mplayerxp/libvo/vo_sdl.c
mplayerxp/libvo/vo_vesa.c
mplayerxp/libvo/vo_x11.c
mplayerxp/libvo/vo_xv.c
mplayerxp/libvo/vo_xvidix.c
mplayerxp/libvo/vosub_vidix.c
mplayerxp/libvo/x11_common.c
mplayerxp/loader/afl.c
mplayerxp/loader/com.h
mplayerxp/loader/dmo/DMO_AudioDecoder.c
mplayerxp/loader/dmo/DMO_VideoDecoder.c
mplayerxp/loader/dmo/buffer.c
mplayerxp/loader/dmo/dmo.c
mplayerxp/loader/dshow/DS_AudioDecoder.c
mplayerxp/loader/dshow/DS_Filter.c
mplayerxp/loader/dshow/DS_VideoDecoder.c
mplayerxp/loader/dshow/allocator.c
mplayerxp/loader/dshow/cmediasample.c
mplayerxp/loader/dshow/inputpin.c
mplayerxp/loader/dshow/libwin32.h
mplayerxp/loader/dshow/mediatype.c
mplayerxp/loader/dshow/mediatype.h
mplayerxp/loader/dshow/outputpin.c
mplayerxp/loader/dshow/test.c
mplayerxp/loader/elfdll.c
mplayerxp/loader/ext.c
mplayerxp/loader/ldt_keeper.c
mplayerxp/loader/loader.h
mplayerxp/loader/module.c
mplayerxp/loader/pe_image.c
mplayerxp/loader/pe_resource.c
mplayerxp/loader/qtx/qtxsdk/components.h
mplayerxp/loader/registry.c
mplayerxp/loader/resource.c
mplayerxp/loader/vfl.c
mplayerxp/loader/win32.c
mplayerxp/loader/wine/avifmt.h
mplayerxp/loader/wine/driver.h
mplayerxp/loader/wine/heap.h
mplayerxp/loader/wine/ldt.h
mplayerxp/loader/wine/mmreg.h
mplayerxp/loader/wine/module.h
mplayerxp/loader/wine/msacm.h
mplayerxp/loader/wine/msacmdrv.h
mplayerxp/loader/wine/ntdef.h
mplayerxp/loader/wine/pe_image.h
mplayerxp/loader/wine/vfw.h
mplayerxp/loader/wine/winbase.h
mplayerxp/loader/wine/windef.h
mplayerxp/loader/wine/winerror.h
mplayerxp/loader/wine/winnt.h
mplayerxp/loader/wine/winreg.h
mplayerxp/loader/wine/winuser.h
mplayerxp/mplayerxp.c
mplayerxp/nls/help_mp-cz.h
mplayerxp/nls/help_mp-de.h
mplayerxp/nls/help_mp-dk.h
mplayerxp/nls/help_mp-es.h
mplayerxp/nls/help_mp-fr.h
mplayerxp/nls/help_mp-hu.h
mplayerxp/nls/help_mp-ko.h
mplayerxp/nls/help_mp-nl.h
mplayerxp/nls/help_mp-pl.h
mplayerxp/nls/help_mp-ro.h
mplayerxp/nls/help_mp-sk.h
mplayerxp/nls/help_mp-sv.h
mplayerxp/nls/help_mp-tr.h
mplayerxp/nls/help_mp-zh.h
mplayerxp/osdep/bswap.h
mplayerxp/osdep/cpudetect.c
mplayerxp/osdep/cputable.h
mplayerxp/osdep/getch2.c
mplayerxp/osdep/shmem.c
mplayerxp/osdep/timer-lx.c
mplayerxp/osdep/vbelib.c
mplayerxp/postproc/af.c
mplayerxp/postproc/af.h
mplayerxp/postproc/af_center.c
mplayerxp/postproc/af_channels.c
mplayerxp/postproc/af_comp.c
mplayerxp/postproc/af_control.h
mplayerxp/postproc/af_crystality.c
mplayerxp/postproc/af_delay.c
mplayerxp/postproc/af_dummy.c
mplayerxp/postproc/af_dyn.c
mplayerxp/postproc/af_echo3d.c
mplayerxp/postproc/af_equalizer.c
mplayerxp/postproc/af_export.c
mplayerxp/postproc/af_extrastereo.c
mplayerxp/postproc/af_ffenc.c
mplayerxp/postproc/af_format.c
mplayerxp/postproc/af_format_alaw.c
mplayerxp/postproc/af_format_ulaw.c
mplayerxp/postproc/af_gate.c
mplayerxp/postproc/af_hrtf.c
mplayerxp/postproc/af_karaoke.c
mplayerxp/postproc/af_lp.c
mplayerxp/postproc/af_pan.c
mplayerxp/postproc/af_raw.c
mplayerxp/postproc/af_scaletempo.c
mplayerxp/postproc/af_sinesuppress.c
mplayerxp/postproc/af_sub.c
mplayerxp/postproc/af_surround.c
mplayerxp/postproc/af_tools.c
mplayerxp/postproc/af_volume.c
mplayerxp/postproc/aflib.c
mplayerxp/postproc/aflib.h
mplayerxp/postproc/aflib_accel.h
mplayerxp/postproc/libmenu/menu.c
mplayerxp/postproc/libmenu/menu.h
mplayerxp/postproc/libmenu/menu_cmdlist.c
mplayerxp/postproc/libmenu/menu_console.c
mplayerxp/postproc/libmenu/menu_filesel.c
mplayerxp/postproc/libmenu/menu_list.c
mplayerxp/postproc/libmenu/menu_param.c
mplayerxp/postproc/libmenu/menu_pt.c
mplayerxp/postproc/libmenu/menu_txt.c
mplayerxp/postproc/mpc_info.h
mplayerxp/postproc/swscale.c
mplayerxp/postproc/vf.c
mplayerxp/postproc/vf.h
mplayerxp/postproc/vf_1bpp.c
mplayerxp/postproc/vf_2xsai.c
mplayerxp/postproc/vf_delogo.c
mplayerxp/postproc/vf_denoise3d.c
mplayerxp/postproc/vf_dint.c
mplayerxp/postproc/vf_down3dright.c
mplayerxp/postproc/vf_eq.c
mplayerxp/postproc/vf_expand.c
mplayerxp/postproc/vf_flip.c
mplayerxp/postproc/vf_format.c
mplayerxp/postproc/vf_framestep.c
mplayerxp/postproc/vf_il.c
mplayerxp/postproc/vf_menu.c
mplayerxp/postproc/vf_mirror.c
mplayerxp/postproc/vf_noise.c
mplayerxp/postproc/vf_ow.c
mplayerxp/postproc/vf_palette.c
mplayerxp/postproc/vf_panscan.c
mplayerxp/postproc/vf_perspective.c
mplayerxp/postproc/vf_pp.c
mplayerxp/postproc/vf_raw.c
mplayerxp/postproc/vf_rectangle.c
mplayerxp/postproc/vf_rgb2bgr.c
mplayerxp/postproc/vf_rotate.c
mplayerxp/postproc/vf_scale.c
mplayerxp/postproc/vf_smartblur.c
mplayerxp/postproc/vf_softpulldown.c
mplayerxp/postproc/vf_test.c
mplayerxp/postproc/vf_unsharp.c
mplayerxp/postproc/vf_vo.c
mplayerxp/postproc/vf_yuvcsp.c
mplayerxp/postproc/vf_yuy2.c
mplayerxp/postproc/vf_yvu9.c
mplayerxp/pvector/pvector.h
mplayerxp/xmpcore/mp_aframe.h
mplayerxp/xmpcore/xmp_adecoder.c
mplayerxp/xmpcore/xmp_aplayer.c
mplayerxp/xmpcore/xmp_vdecoder.c
Modified: mplayerxp/cfg-mplayerxp.h
===================================================================
--- mplayerxp/cfg-mplayerxp.h 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/cfg-mplayerxp.h 2012-11-13 08:37:15 UTC (rev 353)
@@ -26,7 +26,7 @@
/*
* CONF_TYPE_FUNC_FULL :
* allows own implemtations for passing the params
- *
+ *
* the function receives parameter name and argument (if it does not start with - )
* useful with a conf.name like 'aa*' to parse several parameters to a function
* return 0 =ok, but we didn't need the param (could be the filename)
@@ -163,9 +163,9 @@
{"file", &mp_conf.sub_name, CONF_TYPE_STRING, 0, 0, 0, "specifies the subtitle file"},
#ifdef USE_ICONV
{"cp", &sub_data.cp, CONF_TYPE_STRING, 0, 0, 0, "specifies codepage of subtitles"},
-#endif
+#endif
{"fps", &mp_conf.sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, "specifies frame/sec rate of subtitle file"},
- {"noauto", &mp_conf.sub_auto, CONF_TYPE_FLAG, 0, 1, 0, "disable autodetection of vobsub for textsubs if vobsub found"},
+ {"noauto", &mp_conf.sub_auto, CONF_TYPE_FLAG, 0, 1, 0, "disable autodetection of vobsub for textsubs if vobsub found"},
{"unicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 0, 1, "tells MPlayerXP to handle the subtitle file as UNICODE"},
{"nounicode", &sub_data.unicode, CONF_TYPE_FLAG, 0, 1, 0, "tells MPlayerXP to handle the subtitle file as non-UNICODE"},
{"utf8", &sub_data.utf8, CONF_TYPE_FLAG, 0, 0, 1, "tells MPlayerXP to handle the subtitle file as UTF8"},
Modified: mplayerxp/dump.c
===================================================================
--- mplayerxp/dump.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/dump.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -351,7 +351,7 @@
float a_pts;
while(sha->timer < (shv?priv->vtimer:HUGE) || !shv || veof) /* autolimitation of audio reading */
{
- /* we should try to keep structure of audio packets here
+ /* we should try to keep structure of audio packets here
and don't generate badly interlaved stream.
The ideal case is: type=read_packet(ANY_TYPE); put_packet(type);
*/
@@ -361,7 +361,7 @@
else
a_duration=(float)in_size/(float)(sha->i_bps);
if(mpeg_atimer==HUGE) mpeg_atimer=a_pts;
- else
+ else
{
if( mpeg_atimer-a_duration<a_pts) mpeg_atimer=a_pts;
else mpeg_atimer+=a_duration;
Modified: mplayerxp/input2/input.c
===================================================================
--- mplayerxp/input2/input.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/input2/input.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -440,7 +440,7 @@
{ "cmdlist", mp_input_print_cmd_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, "prints all commands that can be bound to keys" },
{ "file", &libinput_conf.in_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, "specifes file with commands (useful for FIFO)" },
#ifdef HAVE_LIRC
- { "lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, "specifies a config.file for LIRC"},
+ { "lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, "specifies a config.file for LIRC"},
#endif
{ "lirc", &libinput_conf.use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, "enables using of lirc" },
{ "nolirc", &libinput_conf.use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, "disables using of lirc" },
Modified: mplayerxp/libao2/afmt.h
===================================================================
--- mplayerxp/libao2/afmt.h 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libao2/afmt.h 2012-11-13 08:37:15 UTC (rev 353)
@@ -4,7 +4,7 @@
#ifdef HAVE_SYS_SOUNDCARD_H
#include <sys/soundcard.h> /* For AFMT_* on linux */
-#else
+#else
#ifdef HAVE_SOUNDCARD_H
#include <soundcard.h> /* OpenBSD have this instead of <sys/soundcard> */
#endif
Modified: mplayerxp/libao2/ao_alsa9.c
===================================================================
--- mplayerxp/libao2/ao_alsa9.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libao2/ao_alsa9.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -362,7 +362,7 @@
MSG_ERR("alsa-init: memory allocation error: %s\n", snd_strerror(err));
return MPXP_False;
}
-
+
if ((tmp_device = snd_pcm_info_get_device(alsa_info)) < 0) {
MSG_ERR("alsa-init: cant get device\n");
return MPXP_False;
@@ -552,7 +552,7 @@
}
#else
{
- int dir=0;
+ int dir=0;
unsigned period_time=100000; /* period time in us */
snd_pcm_uframes_t size;
if ((err = snd_pcm_hw_params_set_period_time_near(priv->handler, priv->hwparams, &period_time, &dir)) < 0) {
@@ -570,7 +570,7 @@
chunk_size=size;
}
#endif
- // gets buffersize for control
+ // gets buffersize for control
if ((err = snd_pcm_hw_params_get_buffer_size(priv->hwparams,&dummy)) < 0) {
MSG_ERR("alsa-conf: unable to get buffersize: %s\n", snd_strerror(err));
return MPXP_False;
@@ -804,10 +804,10 @@
MSG_ERR("alsa-play: xrun reset error");
return 0;
}
- } else if (res == -ESTRPIPE) { /* suspend */
+ } else if (res == -ESTRPIPE) { /* suspend */
MSG_WARN("alsa-play: pcm in suspend mode. trying to resume\n");
while ((res = snd_pcm_resume(priv->handler)) == -EAGAIN) sleep(1);
- } else if (res < 0) {
+ } else if (res < 0) {
MSG_ERR("alsa-play: unknown status, trying to reset soundcard\n");
if ((res = snd_pcm_prepare(priv->handler)) < 0) {
MSG_ERR("alsa-play: snd prepare error");
Modified: mplayerxp/libao2/ao_jack.c
===================================================================
--- mplayerxp/libao2/ao_jack.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libao2/ao_jack.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -197,19 +197,19 @@
static void print_help (void)
{
MSG_FATAL(
- "\n-ao jack commandline help:\n"
- "Example: mplayer -ao jack:port=myout\n"
- " connects MPlayer to the jack priv->ports named myout\n"
- "\nOptions:\n"
- " port=<port name>\n"
- " Connects to the given priv->ports instead of the default physical ones\n"
- " name=<client name>\n"
- " priv->client name to pass to JACK\n"
- " priv->estimate\n"
- " priv->estimates the amount of data in priv->buffers (experimental)\n"
- " autostart\n"
- " Automatically start JACK server if necessary\n"
- );
+ "\n-ao jack commandline help:\n"
+ "Example: mplayer -ao jack:port=myout\n"
+ " connects MPlayer to the jack priv->ports named myout\n"
+ "\nOptions:\n"
+ " port=<port name>\n"
+ " Connects to the given priv->ports instead of the default physical ones\n"
+ " name=<client name>\n"
+ " priv->client name to pass to JACK\n"
+ " priv->estimate\n"
+ " priv->estimates the amount of data in priv->buffers (experimental)\n"
+ " autostart\n"
+ " Automatically start JACK server if necessary\n"
+ );
}
#endif
static MPXP_Rc init(ao_data_t* ao,unsigned flags) {
Modified: mplayerxp/libao2/ao_nas.c
===================================================================
--- mplayerxp/libao2/ao_nas.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libao2/ao_nas.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -314,8 +314,8 @@
}
}
if (nas_readBuffer(priv,
- priv->server_buffer_size -
- priv->server_buffer_used) != 0) {
+ priv->server_buffer_size -
+ priv->server_buffer_used) != 0) {
event->cur_state = AuStateStart;
break;
}
@@ -403,7 +403,7 @@
AuSetElementParameters(priv->aud, 1, &aep, &as);
if (as != AuSuccess) {
nas_print_error(priv->aud,
- "control(): AuSetElementParameters", as);
+ "control(): AuSetElementParameters", as);
retval = MPXP_Error;
} else retval = MPXP_Ok;
break;
@@ -574,7 +574,7 @@
AuStartFlow(priv->aud, priv->flow, &as);
if (as != AuSuccess)
nas_print_error(priv->aud,
- "play(): AuStartFlow", as);
+ "play(): AuStartFlow", as);
}
Modified: mplayerxp/libao2/ao_null.c
===================================================================
--- mplayerxp/libao2/ao_null.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libao2/ao_null.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -60,7 +60,7 @@
/* init with default values */
static struct WaveHeader wavhdr = {
WAV_ID_RIFF,
- /* same conventions than in sox/wav.c/wavwritehdr() */
+ /* same conventions than in sox/wav.c/wavwritehdr() */
0, //le2me_32(0x7ffff024),
WAV_ID_WAVE,
WAV_ID_FMT,
Modified: mplayerxp/libao2/ao_openal.c
===================================================================
--- mplayerxp/libao2/ao_openal.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libao2/ao_openal.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -68,8 +68,8 @@
ALfloat volume;
ao_control_vol_t *vol = (ao_control_vol_t *)arg;
if (cmd == AOCONTROL_SET_VOLUME) {
- volume = (vol->left + vol->right) / 200.0;
- alListenerf(AL_GAIN, volume);
+ volume = (vol->left + vol->right) / 200.0;
+ alListenerf(AL_GAIN, volume);
}
alGetListenerf(AL_GAIN, &volume);
vol->left = vol->right = volume * 100;
@@ -85,10 +85,10 @@
*/
static void print_help(void) {
MSG_FATAL(
- "\n-ao openal commandline help:\n"
- "Example: mplayer -ao openal\n"
- "\nOptions:\n"
- );
+ "\n-ao openal commandline help:\n"
+ "Example: mplayer -ao openal\n"
+ "\nOptions:\n"
+ );
}
#endif
static MPXP_Rc init(ao_data_t* ao,unsigned flags)
@@ -252,9 +252,9 @@
for (i = 0; i < len; i++) {
for (ch = 0; ch < ao->channels; ch++) {
for (j = 0, k = ch; j < CHUNK_SIZE / 2; j++, k += ao->channels)
- priv->tmpbuf[j] = d[k];
+ priv->tmpbuf[j] = d[k];
alBufferData(priv->buffers[ch][priv->cur_buf[ch]], AL_FORMAT_MONO16, priv->tmpbuf,
- CHUNK_SIZE, ao->samplerate);
+ CHUNK_SIZE, ao->samplerate);
alSourceQueueBuffers(priv->sources[ch], 1, &priv->buffers[ch][priv->cur_buf[ch]]);
priv->cur_buf[ch] = (priv->cur_buf[ch] + 1) % NUM_BUF;
}
Modified: mplayerxp/libao2/ao_oss.c
===================================================================
--- mplayerxp/libao2/ao_oss.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libao2/ao_oss.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -107,13 +107,13 @@
{
if (cmd == AOCONTROL_GET_VOLUME)
{
- ioctl(fd, MIXER_READ(priv->mixer_channel), &v);
+ ioctl(fd, MIXER_READ(priv->mixer_channel), &v);
vol->right = (v & 0xFF00) >> 8;
vol->left = v & 0x00FF;
}
else
{
- v = ((int)vol->right << 8) | (int)vol->left;
+ v = ((int)vol->right << 8) | (int)vol->left;
ioctl(fd, MIXER_WRITE(priv->mixer_channel), &v);
}
}
@@ -159,7 +159,7 @@
if(rval & AFMT_S32_BE) MSG_INFO("AFMT_S32_BE ");
if(rval & AFMT_U32_LE) MSG_INFO("AFMT_U32_LE ");
if(rval & AFMT_U32_BE) MSG_INFO("AFMT_U32_LE ");
- MSG_INFO("\n");
+ MSG_INFO("\n");
}
}
@@ -444,7 +444,7 @@
ierr=ioctl(priv->fd, SNDCTL_DSP_GETODELAY, &r);
if(ierr!=-1)
{
- return ((float)r)/(float)ao->bps;
+ return ((float)r)/(float)ao->bps;
}
#endif
priv->delay_method=1; // fallback if not supported
@@ -454,7 +454,7 @@
ierr=ioctl(priv->fd, SNDCTL_DSP_GETOSPACE, &priv->zz);
if(ierr!=-1)
{
- return ((float)(ao->buffersize-priv->zz.bytes))/(float)ao->bps;
+ return ((float)(ao->buffersize-priv->zz.bytes))/(float)ao->bps;
}
priv->delay_method=0; // fallback if not supported
}
Modified: mplayerxp/libao2/audio_out.c
===================================================================
--- mplayerxp/libao2/audio_out.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libao2/audio_out.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -38,10 +38,10 @@
static const ao_functions_t* audio_out_drivers[] =
{
#ifdef USE_OSS_AUDIO
- &audio_out_oss,
+ &audio_out_oss,
#endif
#ifdef HAVE_SDL
- &audio_out_sdl,
+ &audio_out_sdl,
#endif
#ifdef HAVE_ALSA
&audio_out_alsa,
@@ -61,8 +61,8 @@
#ifdef HAVE_JACK
&audio_out_jack,
#endif
- &audio_out_wav,
- &audio_out_null,
+ &audio_out_wav,
+ &audio_out_null,
NULL
};
@@ -84,7 +84,7 @@
return("Unsigned 8-bit");
case AFMT_U16_LE:
return("Unsigned 16-bit (Little-Endian)");
- case AFMT_U16_BE:
+ case AFMT_U16_BE:
return("Unsigned 16-bit (Big-Endian)");
case AFMT_S16_LE:
return("Signed 16-bit (Little-Endian)");
@@ -92,7 +92,7 @@
return("Signed 16-bit (Big-Endian)");
case AFMT_U24_LE:
return("Unsigned 24-bit (Little-Endian)");
- case AFMT_U24_BE:
+ case AFMT_U24_BE:
return("Unsigned 24-bit (Big-Endian)");
case AFMT_S24_LE:
return("Signed 24-bit (Little-Endian)");
@@ -100,7 +100,7 @@
return("Signed 24-bit (Big-Endian)");
case AFMT_U32_LE:
return("Unsigned 32-bit (Little-Endian)");
- case AFMT_U32_BE:
+ case AFMT_U32_BE:
return("Unsigned 32-bit (Big-Endian)");
case AFMT_S32_LE:
return("Signed 32-bit (Little-Endian)");
@@ -154,7 +154,7 @@
case AFMT_S16_LE:
case AFMT_S16_BE:
return 16;//16 bits
-
+
case AFMT_MU_LAW:
case AFMT_A_LAW:
case AFMT_IMA_ADPCM:
@@ -164,7 +164,7 @@
case AFMT_AC3:
default:
return 8;//default 1 byte
-
+
}
return 8;
}
Modified: mplayerxp/libao2/audio_out_internal.h
===================================================================
--- mplayerxp/libao2/audio_out_internal.h 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libao2/audio_out_internal.h 2012-11-13 08:37:15 UTC (rev 353)
@@ -18,7 +18,7 @@
control,\
init,\
configure,\
- uninit,\
+ uninit,\
reset,\
get_space,\
play,\
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_a52.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -32,7 +32,7 @@
#include "osdep/bswap.h"
#include "osdep/mplib.h"
-static const ad_info_t info =
+static const ad_info_t info =
{
"liba52 AC3 driver",
"liba52",
Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_acm.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -61,10 +61,10 @@
MSACM_RegisterDriver((const char *)sh_audio->codec->dll_name, sh_audio->wtag, 0);
ret=acmStreamOpen(&priv->srcstream,(HACMDRIVER)NULL,in_fmt,&priv->o_wf,NULL,0,0,0);
if(ret){
- if(ret==ACMERR_NOTPOSSIBLE)
- MSG_ERR("ACM_Decoder: Unappropriate audio format\n");
- else
- MSG_ERR("ACM_Decoder: acmStreamOpen error: %d", (int)ret);
+ if(ret==ACMERR_NOTPOSSIBLE)
+ MSG_ERR("ACM_Decoder: Unappropriate audio format\n");
+ else
+ MSG_ERR("ACM_Decoder: acmStreamOpen error: %d", (int)ret);
priv->srcstream=0;
return 0;
}
@@ -74,8 +74,8 @@
srcsize*=2;
//if(srcsize<MAX_OUTBURST) srcsize=MAX_OUTBURST;
if(!srcsize){
- MSG_WARN("Warning! ACM codec reports srcsize=0\n");
- srcsize=16384;
+ MSG_WARN("Warning! ACM codec reports srcsize=0\n");
+ srcsize=16384;
}
// limit srcsize to 4-16kb
//while(srcsize && srcsize<4096) srcsize*=2;
@@ -129,8 +129,8 @@
float pts;
int ret=decode(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size,&pts);
if(ret<0){
- MSG_INFO("ACM decoding error: %d\n",ret);
- return MPXP_False;
+ MSG_INFO("ACM decoding error: %d\n",ret);
+ return MPXP_False;
}
sh_audio->a_buffer_len=ret;
return MPXP_Ok;
@@ -214,7 +214,7 @@
memset(&ash, 0, sizeof(ash));
ash.cbStruct=sizeof(ash);
ash.fdwStatus=0;
- ash.dwUser=0;
+ ash.dwUser=0;
ash.pbSrc=sh_audio->a_in_buffer;
ash.cbSrcLength=sh_audio->a_in_buffer_len;
ash.pbDst=buf;
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -97,49 +97,49 @@
// not sure if the "& 0xf0" and "<< 4" are the right way around
// can somebody clarify?
for (j = 0; j < minlen; j += 12) {
- char tmp[10];
- len = demux_read_data_r(sh_audio->ds, tmp, 10,j?&null_pts:pts);
- if (len < 10) break;
- // first sample
- buf[j + 0] = tmp[0];
- buf[j + 1] = tmp[1];
- buf[j + 2] = tmp[8] & 0xf0;
- // second sample
- buf[j + 3] = tmp[2];
- buf[j + 4] = tmp[3];
- buf[j + 5] = tmp[8] << 4;
- // third sample
- buf[j + 6] = tmp[4];
- buf[j + 7] = tmp[5];
- buf[j + 8] = tmp[9] & 0xf0;
- // fourth sample
- buf[j + 9] = tmp[6];
- buf[j + 10] = tmp[7];
- buf[j + 11] = tmp[9] << 4;
+ char tmp[10];
+ len = demux_read_data_r(sh_audio->ds, tmp, 10,j?&null_pts:pts);
+ if (len < 10) break;
+ // first sample
+ buf[j + 0] = tmp[0];
+ buf[j + 1] = tmp[1];
+ buf[j + 2] = tmp[8] & 0xf0;
+ // second sample
+ buf[j + 3] = tmp[2];
+ buf[j + 4] = tmp[3];
+ buf[j + 5] = tmp[8] << 4;
+ // third sample
+ buf[j + 6] = tmp[4];
+ buf[j + 7] = tmp[5];
+ buf[j + 8] = tmp[9] & 0xf0;
+ // fourth sample
+ buf[j + 9] = tmp[6];
+ buf[j + 10] = tmp[7];
+ buf[j + 11] = tmp[9] << 4;
}
len = j;
} else {
// 24 bit
for (j = 0; j < minlen; j += 12) {
- char tmp[12];
- len = demux_read_data_r(sh_audio->ds, tmp, 12, j?&null_pts:pts);
- if (len < 12) break;
- // first sample
- buf[j + 0] = tmp[0];
- buf[j + 1] = tmp[1];
- buf[j + 2] = tmp[8];
- // second sample
- buf[j + 3] = tmp[2];
- buf[j + 4] = tmp[3];
- buf[j + 5] = tmp[9];
- // third sample
- buf[j + 6] = tmp[4];
- buf[j + 7] = tmp[5];
- buf[j + 8] = tmp[10];
- // fourth sample
- buf[j + 9] = tmp[6];
- buf[j + 10] = tmp[7];
- buf[j + 11] = tmp[11];
+ char tmp[12];
+ len = demux_read_data_r(sh_audio->ds, tmp, 12, j?&null_pts:pts);
+ if (len < 12) break;
+ // first sample
+ buf[j + 0] = tmp[0];
+ buf[j + 1] = tmp[1];
+ buf[j + 2] = tmp[8];
+ // second sample
+ buf[j + 3] = tmp[2];
+ buf[j + 4] = tmp[3];
+ buf[j + 5] = tmp[9];
+ // third sample
+ buf[j + 6] = tmp[4];
+ buf[j + 7] = tmp[5];
+ buf[j + 8] = tmp[10];
+ // fourth sample
+ buf[j + 9] = tmp[6];
+ buf[j + 10] = tmp[7];
+ buf[j + 11] = tmp[11];
}
len = j;
}
Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_faad.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -1,5 +1,5 @@
/* ad_faad.c - MPlayer AAC decoder using libfaad2
- * This file is part of MPlayer, see http://mplayerhq.hu/ for info.
+ * This file is part of MPlayer, see http://mplayerhq.hu/ for info.
* (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
* File licensed under the GPL, see http://www.fsf.org/ for more info.
*/
@@ -301,7 +301,7 @@
if(NeAAC_finfo.error > 0) {
MSG_WARN("FAAD: error: %s, trying to resync!\n",
- NeAACDecGetErrorMessage(NeAAC_finfo.error));
+ NeAACDecGetErrorMessage(NeAAC_finfo.error));
j++;
} else
break;
Modified: mplayerxp/libmpcodecs/ad_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmpeg.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_ffmpeg.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -207,7 +207,7 @@
if(len==0) len=len2; else len+=len2;
buf+=len2;
}
- MSG_DBG2("Decoded %d -> %d \n",y,len2);
+ MSG_DBG2("Decoded %d -> %d \n",y,len2);
}
*pts=apts;
return len;
Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_hwac3.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -30,44 +30,44 @@
};
static const struct frmsize_s frmsizecod_tbl[64] = {
- { 32 ,{64 ,69 ,96 } },
- { 32 ,{64 ,70 ,96 } },
- { 40 ,{80 ,87 ,120 } },
- { 40 ,{80 ,88 ,120 } },
- { 48 ,{96 ,104 ,144 } },
- { 48 ,{96 ,105 ,144 } },
- { 56 ,{112 ,121 ,168 } },
- { 56 ,{112 ,122 ,168 } },
- { 64 ,{128 ,139 ,192 } },
- { 64 ,{128 ,140 ,192 } },
- { 80 ,{160 ,174 ,240 } },
- { 80 ,{160 ,175 ,240 } },
- { 96 ,{192 ,208 ,288 } },
- { 96 ,{192 ,209 ,288 } },
- { 112 ,{224 ,243 ,336 } },
- { 112 ,{224 ,244 ,336 } },
- { 128 ,{256 ,278 ,384 } },
- { 128 ,{256 ,279 ,384 } },
- { 160 ,{320 ,348 ,480 } },
- { 160 ,{320 ,349 ,480 } },
- { 192 ,{384 ,417 ,576 } },
- { 192 ,{384 ,418 ,576 } },
- { 224 ,{448 ,487 ,672 } },
- { 224 ,{448 ,488 ,672 } },
- { 256 ,{512 ,557 ,768 } },
- { 256 ,{512 ,558 ,768 } },
- { 320 ,{640 ,696 ,960 } },
- { 320 ,{640 ,697 ,960 } },
- { 384 ,{768 ,835 ,1152 } },
- { 384 ,{768 ,836 ,1152 } },
- { 448 ,{896 ,975 ,1344 } },
- { 448 ,{896 ,976 ,1344 } },
- { 512 ,{1024 ,1114 ,1536 } },
- { 512 ,{1024 ,1115 ,1536 } },
- { 576 ,{1152 ,1253 ,1728 } },
- { 576 ,{1152 ,1254 ,1728 } },
- { 640 ,{1280 ,1393 ,1920 } },
- { 640 ,{1280 ,1394 ,1920 } }
+ { 32 ,{64 ,69 ,96 } },
+ { 32 ,{64 ,70 ,96 } },
+ { 40 ,{80 ,87 ,120 } },
+ { 40 ,{80 ,88 ,120 } },
+ { 48 ,{96 ,104 ,144 } },
+ { 48 ,{96 ,105 ,144 } },
+ { 56 ,{112 ,121 ,168 } },
+ { 56 ,{112 ,122 ,168 } },
+ { 64 ,{128 ,139 ,192 } },
+ { 64 ,{128 ,140 ,192 } },
+ { 80 ,{160 ,174 ,240 } },
+ { 80 ,{160 ,175 ,240 } },
+ { 96 ,{192 ,208 ,288 } },
+ { 96 ,{192 ,209 ,288 } },
+ { 112 ,{224 ,243 ,336 } },
+ { 112 ,{224 ,244 ,336 } },
+ { 128 ,{256 ,278 ,384 } },
+ { 128 ,{256 ,279 ,384 } },
+ { 160 ,{320 ,348 ,480 } },
+ { 160 ,{320 ,349 ,480 } },
+ { 192 ,{384 ,417 ,576 } },
+ { 192 ,{384 ,418 ,576 } },
+ { 224 ,{448 ,487 ,672 } },
+ { 224 ,{448 ,488 ,672 } },
+ { 256 ,{512 ,557 ,768 } },
+ { 256 ,{512 ,558 ,768 } },
+ { 320 ,{640 ,696 ,960 } },
+ { 320 ,{640 ,697 ,960 } },
+ { 384 ,{768 ,835 ,1152 } },
+ { 384 ,{768 ,836 ,1152 } },
+ { 448 ,{896 ,975 ,1344 } },
+ { 448 ,{896 ,976 ,1344 } },
+ { 512 ,{1024 ,1114 ,1536 } },
+ { 512 ,{1024 ,1115 ,1536 } },
+ { 576 ,{1152 ,1253 ,1728 } },
+ { 576 ,{1152 ,1254 ,1728 } },
+ { 640 ,{1280 ,1393 ,1920 } },
+ { 640 ,{1280 ,1394 ,1920 } }
};
struct syncframe {
Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_libdv.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -110,9 +110,9 @@
for (i=0; i < decoder->audio->samples_this_frame; i++)
{
- int ch;
- for (ch=0; ch < decoder->audio->num_channels; ch++)
- bufP[len++] = priv->audioBuffers[ch][i];
+ int ch;
+ for (ch=0; ch < decoder->audio->num_channels; ch++)
+ bufP[len++] = priv->audioBuffers[ch][i];
}
}
len+=decoder->audio->samples_this_frame;
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -89,7 +89,7 @@
MPG123_RVA, /**< one of the RVA choices above (integer) */
MPG123_DOWNSPEED, /**< play a frame N times (integer) */
MPG123_UPSPEED, /**< play every Nth frame (integer) */
- MPG123_START_FRAME, /**< start with this frame (skip frames before that, integer) */
+ MPG123_START_FRAME, /**< start with this frame (skip frames before that, integer) */
MPG123_DECODE_FRAMES,/**< decode only this number of frames (integer) */
MPG123_ICY_INTERVAL,/**< stream contains ICY metadata with this interval (integer) */
MPG123_OUTSCALE, /**< the scale for output samples (amplitude - integer or float according to mpg123 output format, normally integer) */
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -64,8 +64,8 @@
unsigned long *outputBytes );
typedef int (__cdecl* LPFUNC8)(SoundConverter sc,
any_t*outputPtr,
- unsigned long *outputFrames,
- unsigned long *outputBytes);
+ unsigned long *outputFrames,
+ unsigned long *outputBytes);
typedef int (__cdecl* LPFUNC9)(SoundConverter sc);
static HINSTANCE qtml_dll;
Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_real.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -235,16 +235,16 @@
unsigned char *p=sh->a_in_buffer;
demux_read_data_r(sh->ds, p, h*w,pts);
for(n=0;n<38;n++){
- int i=bs*sipr_swaps[n][0];
- int o=bs*sipr_swaps[n][1];
+ int i=bs*sipr_swaps[n][0];
+ int o=bs*sipr_swaps[n][1];
// swap nibbles of block 'i' with 'o' TODO: optimize
for(j=0;j<bs;j++){
int x=(i&1) ? (p[(i>>1)]>>4) : (p[(i>>1)]&15);
int y=(o&1) ? (p[(o>>1)]>>4) : (p[(o>>1)]&15);
if(o&1) p[(o>>1)]=(p[(o>>1)]&0x0F)|(x<<4);
- else p[(o>>1)]=(p[(o>>1)]&0xF0)|x;
+ else p[(o>>1)]=(p[(o>>1)]&0xF0)|x;
if(i&1) p[(i>>1)]=(p[(i>>1)]&0x0F)|(y<<4);
- else p[(i>>1)]=(p[(i>>1)]&0xF0)|y;
+ else p[(i>>1)]=(p[(i>>1)]&0xF0)|y;
++i;++o;
}
}
@@ -272,7 +272,7 @@
priv->pts=FIX_APTS(sh,priv->pts,sh->wf->nBlockAlign);
return len; // return value: number of _bytes_ written to output buffer,
- // or -1 for EOF (or uncorrectable error)
+ // or -1 for EOF (or uncorrectable error)
}
static MPXP_Rc control(sh_audio_t *sh,int cmd,any_t* arg, ...){
Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_twin.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -225,7 +225,7 @@
#endif
vqf_dll = LoadLibraryA((LPCSTR)libname);
if( vqf_dll == NULL ) {
- MSG_ERR("failed loading dll\n" );
+ MSG_ERR("failed loading dll\n" );
return 0;
}
TvqInitialize_ptr = GetProcAddress(vqf_dll,(LPCSTR)"TvqInitialize");
@@ -366,7 +366,7 @@
unsigned char mask, tmpdat;
int retval;
priv_t *priv=sh->context;
-
+
/*--- Main operation ---*/
retval = 0;
mask = 0x1;
@@ -386,7 +386,7 @@
tmpdat = (unsigned char)priv->buf[ibufadr];
tmpdat >>= (BYTE_BIT-ibufbit-1);
/* current data bit */
-
+
idata = ibits*size; /* output data address */
data[idata] = (char)(tmpdat & mask); /* set output data */
for (icl=1; icl<size; icl++)
@@ -413,7 +413,7 @@
unsigned work;
char tmpbit[BITS_INT];
int retval;
-
+
if ( nbits > BITS_INT ){
MSG_ERR( "get_bstm(): %d: %d Error.\n",
nbits, BITS_INT);
@@ -512,7 +512,7 @@
int bitcount = 0;
priv_t*priv=sh->context;
float pts;
-
+
for ( idiv=0; idiv<cf->N_DIV_P; idiv++ ){
bitcount += get_bstm(&(_index->pls[idiv]), priv->bits_0[BLK_PPC][idiv],sh,&pts); /*CB0*/
bitcount += get_bstm(&(_index->pls[idiv+cf->N_DIV_P]), priv->bits_1[BLK_PPC][idiv],sh,&pts);/*CB1*/
@@ -521,7 +521,7 @@
bitcount += get_bstm(&(_index->pit[i_sup]), cf->BASF_BIT,sh,&pts);
bitcount += get_bstm(&(_index->pgain[i_sup]), cf->PGAIN_BIT,sh,&pts);
}
-
+
return bitcount;
}
@@ -539,7 +539,7 @@
}
}
}
-
+
return bitcount;
}
@@ -552,7 +552,7 @@
int numFixedBitsPerFrame = TvqGetNumFixedBitsPerFrame();
int btype;
priv_t *priv=sh->context;
-
+
/*--- Initialization ---*/
variableBits = 0;
bitcount = 0;
@@ -570,10 +570,10 @@
cfg = &priv->cf.cfg[btype]; // set the block dependent paremeters table
bitcount += variableBits;
-
+
/* Interleaved vector quantization */
bitcount += GetVqInfo( cfg, priv->bits_0[btype], priv->bits_1[btype], variableBits, _index, sh );
-
+
/* Bark-scale envelope */
bitcount += GetBseInfo( &priv->cf, cfg, _index, sh );
/* Gain */
@@ -588,7 +588,7 @@
if ( cfg->ebc_enable ){
bitcount += GetEbcInfo( &priv->cf, cfg, _index, sh );
}
-
+
return bitcount == numFixedBitsPerFrame ? bitcount/8 : 0;
}
@@ -601,7 +601,7 @@
unsigned ismp, ich;
float *ptr;
register float dtmp;
-
+
for ( ich=0; ich<numChannels; ich++ ){
ptr = out+ich*frameSize;
for ( ismp=0; ismp<frameSize; ismp++ ){
Modified: mplayerxp/libmpcodecs/ad_vorbis.c
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/ad_vorbis.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -135,12 +135,12 @@
static unsigned decode(sh_audio_t *sh,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts)
{
- unsigned len = 0;
- int samples;
- float **pcm;
- ogg_packet op;
- priv_t *ov = sh->context;
- op.b_o_s = op.e_o_s = 0;
+ unsigned len = 0;
+ int samples;
+ float **pcm;
+ ogg_packet op;
+ priv_t *ov = sh->context;
+ op.b_o_s = op.e_o_s = 0;
while(len < minlen) {
/* if file contains audio only steam there is no pts */
op.bytes = ds_get_packet_r(sh->ds,&op.packet,pts);
@@ -153,7 +153,7 @@
int clipflag=0;
int convsize=(maxlen-len)/(2*ov->vi.channels); // max size!
int bout=(samples<convsize?samples:convsize);
-
+
if(bout<=0) break;
if(afmt2bps(sh->afmt)==4) {
Modified: mplayerxp/libmpcodecs/dec_audio.h
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.h 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/dec_audio.h 2012-11-13 08:37:15 UTC (rev 353)
@@ -19,8 +19,8 @@
unsigned out_samplerate, unsigned out_channels,mpaf_format_e out_format,
unsigned out_minsize, unsigned out_maxsize);
extern MPXP_Rc mpca_preinit_filters(sh_audio_t *sh_audio,
- unsigned in_samplerate, unsigned in_channels, unsigned in_format,
- unsigned* out_samplerate, unsigned* out_channels, unsigned* out_format);
+ unsigned in_samplerate, unsigned in_channels, unsigned in_format,
+ unsigned* out_samplerate, unsigned* out_channels, unsigned* out_format);
extern MPXP_Rc mpca_reinit_filters(sh_audio_t *sh_audio,
unsigned in_samplerate, unsigned in_channels, mpaf_format_e in_format,
unsigned out_samplerate, unsigned out_channels, mpaf_format_e out_format,
Modified: mplayerxp/libmpcodecs/dec_video.c
===================================================================
--- mplayerxp/libmpcodecs/dec_video.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/dec_video.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -292,8 +292,8 @@
if(mp_conf.sub_fps==0) mp_conf.sub_fps=sh_video->fps;
MP_UNIT("find_sub");
if (pts > sub_last_pts || pts < sub_last_pts-1.0 ) {
- find_sub(mp_data->subtitles,sub_uses_time?(100*pts):(pts*mp_conf.sub_fps),vo_data); // FIXME! frame counter...
- sub_last_pts = pts;
+ find_sub(mp_data->subtitles,sub_uses_time?(100*pts):(pts*mp_conf.sub_fps),vo_data); // FIXME! frame counter...
+ sub_last_pts = pts;
}
MP_UNIT(NULL);
}
Modified: mplayerxp/libmpcodecs/liba52/bitstream.c
===================================================================
--- mplayerxp/libmpcodecs/liba52/bitstream.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/liba52/bitstream.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -89,7 +89,7 @@
if (num_bits != 0)
result = (result << num_bits) | (state->current_word >> (32 - num_bits));
-
+
state->bits_left = 32 - num_bits;
return result;
Modified: mplayerxp/libmpcodecs/liba52/bitstream.h
===================================================================
--- mplayerxp/libmpcodecs/liba52/bitstream.h 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/liba52/bitstream.h 2012-11-13 08:37:15 UTC (rev 353)
@@ -53,7 +53,7 @@
static inline uint32_t bitstream_get (a52_state_t * state, uint32_t num_bits)
{
uint32_t result;
-
+
if (num_bits < state->bits_left) {
result = (state->current_word << (32 - state->bits_left)) >> (32 - num_bits);
state->bits_left -= num_bits;
@@ -66,7 +66,7 @@
static inline int32_t bitstream_get_2 (a52_state_t * state, uint32_t num_bits)
{
int32_t result;
-
+
if (num_bits < state->bits_left) {
result = (((int32_t)state->current_word) << (32 - state->bits_left)) >> (32 - num_bits);
state->bits_left -= num_bits;
Modified: mplayerxp/libmpcodecs/liba52/crc.c
===================================================================
--- mplayerxp/libmpcodecs/liba52/crc.c 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/liba52/crc.c 2012-11-13 08:37:15 UTC (rev 353)
@@ -1,23 +1,23 @@
-/*
+/*
* crc.c
*
* Copyright (C) Aaron Holtzman - May 1999
*
* This file is part of ac3dec, a mp_free Dolby AC-3 stream decoder.
- *
+ *
* ac3dec is mp_free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* ac3dec is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <inttypes.h>
-static const uint16_t crc_lut[256] =
+static const uint16_t crc_lut[256] =
{
0x0000,0x8005,0x800f,0x000a,0x801b,0x001e,0x0014,0x8011,
0x8033,0x0036,0x003c,0x8039,0x0028,0x802d,0x8027,0x0022,
Modified: mplayerxp/libmpcodecs/liba52/downmix_mmx.h
===================================================================
--- mplayerxp/libmpcodecs/liba52/downmix_mmx.h 2012-11-13 07:51:55 UTC (rev 352)
+++ mplayerxp/libmpcodecs/liba52/downmix_mmx.h 2012-11-13 08:37:15 UTC (rev 353)
@@ -35,10 +35,10 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps (%0, %%"REG_S"), %%xmm0 \n\t"
- "movaps 16(%0, %%"REG_S"), %%xmm1 \n\t"
- "addps (%1, %%"REG_S"), %%xmm0 \n\t"
- "addps 16(%1, %%"REG_S"), %%xmm1 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 16(%0, %%"REG_S"), %%xmm1 \n\t"
+ "addps (%1, %%"REG_S"), %%xmm0 \n\t"
+ "addps 16(%1, %%"REG_S"), %%xmm1 \n\t"
"addps %%xmm7, %%xmm0 \n\t"
"addps %%xmm7, %%xmm1 \n\t"
"movaps %%xmm0, (%1, %%"REG_S") \n\t"
@@ -59,13 +59,13 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq (%0, %%"REG_S"), %%mm0 \n\t"
+ "movq (%0, %%"REG_S"), %%mm0 \n\t"
"movq 8(%0, %%"REG_S"), %%mm1 \n\t"
- "movq 16(%0, %%"REG_S"), %%mm2 \n\t"
+ "movq 16(%0, %%"REG_S"), %%mm2 \n\t"
"movq 24(%0, %%"REG_S"), %%mm3 \n\t"
- "pfadd (%1, %%"REG_S"), %%mm0 \n\t"
+ "pfadd (%1, %%"REG_S"), %%mm0 \n\t"
"pfadd 8(%1, %%"REG_S"), %%mm1 \n\t"
- "pfadd 16(%1, %%"REG_S"), %%mm2 \n\t"
+ "pfadd 16(%1, %%"REG_S"), %%mm2 \n\t"
"pfadd 24(%1, %%"REG_S"), %%mm3 \n\t"
"pfadd %%mm7, %%mm0 \n\t"
"pfadd %%mm7, %%mm1 \n\t"
@@ -104,9 +104,9 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps (%0, %%"REG_S"), %%xmm0 \n\t"
- "movaps 1024(%0, %%"REG_S"), %%xmm1 \n\t"
- "addps 2048(%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 1024(%0, %%"REG_S"), %%xmm1 \n\t"
+ "addps 2048(%0, %%"REG_S"), %%xmm0 \n\t"
"addps %%xmm7, %%xmm1 \n\t"
"addps %%xmm1, %%xmm0 \n\t"
"movaps %%xmm0, (%0, %%"REG_S") \n\t"
@@ -126,11 +126,11 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq (%0, %%"REG_S"), %%mm0 \n\t"
+ "movq (%0, %%"REG_S"), %%mm0 \n\t"
"movq 8(%0, %%"REG_S"), %%mm1 \n\t"
- "movq 1024(%0, %%"REG_S"), %%mm2 \n\t"
+ "movq 1024(%0, %%"REG_S"), %%mm2 \n\t"
"movq 1032(%0, %%"REG_S"), %%mm3 \n\t"
- "pfadd 2048(%0, %%"REG_S"), %%mm0 \n\t"
+ "pfadd 2048(%0, %%"REG_S"), %%mm0 \n\t"
"pfadd 2056(%0, %%"REG_S"), %%mm1 \n\t"
"pfadd %%mm7, %%mm0 \n\t"
"pfadd %%mm7, %%mm1 \n\t"
@@ -167,10 +167,10 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps (%0, %%"REG_S"), %%xmm0 \n\t"
- "movaps 1024(%0, %%"REG_S"), %%xmm1 \n\t"
- "addps 2048(%0, %%"REG_S"), %%xmm0 \n\t"
- "addps 3072(%0, %%"REG_S"), %%xmm1 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 1024(%0, %%"REG_S"), %%xmm1 \n\t"
+ "addps 2048(%0, %%"REG_S"), %%xmm0 \n\t"
+ "addps 3072(%0, %%"REG_S"), %%xmm1 \n\t"
"addps %%xmm7, %%xmm0 \n\t"
"addps %%xmm1, %%xmm0 \n\t"
"movaps %%xmm0, (%0, %%"REG_S") \n\t"
@@ -190,13 +190,13 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq (%0, %%"REG_S"), %%mm0 \n\t"
+ "movq (%0, %%"REG_S"), %%mm0 \n\t"
"movq 8(%0, %%"REG_S"), %%mm1 \n\t"
- "movq 1024(%0, %%"REG_S"), %%mm2 \n\t"
+ "movq 1024(%0, %%"REG_S"), %%mm2 \n\t"
"movq 1032(%0, %%"REG_S"), %%mm3 \n\t"
- "pfadd 2048(%0, %%"REG_S"), %%mm0 \n\t"
+ "pfadd 2048(%0, %%"REG_S"), %%mm0 \n\t"
"pfadd 2056(%0, %%"REG_S"), %%mm1 \n\t"
- "pfadd 3072(%0, %%"REG_S"), %%mm2 \n\t"
+ "pfadd 3072(%0, %%"REG_S"), %%mm2 \n\t"
"pfadd 3080(%0, %%"REG_S"), %%mm3 \n\t"
"pfadd %%mm7, %%mm0 \n\t"
"pfadd %%mm7, %%mm1 \n\t"
@@ -234,12 +234,12 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps (%0, %%"REG_S"), %%xmm0 \n\t"
- "movaps 1024(%0, %%"REG_S"), %%xmm1 \n\t"
- "addps 2048(%0, %%"REG_S"), %%xmm0 \n\t"
- "addps 3072(%0, %%"REG_S"), %%xmm1 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 1024(%0, %%"REG_S"), %%xmm1 \n\t"
+ "addps 2048(%0, %%"REG_S"), %%xmm0 \n\t"
+ "addps 3072(%0, %%"REG_S"), %%xmm1 \n\t"
"addps %%xmm7, %%xmm0 \n\t"
- "addps 4096(%0, %%"REG_S"), %%xmm1 \n\t"
+ "addps 4096(%0, %%"REG_S"), %%xmm1 \n\t"
"addps %%xmm1, %%xmm0 \n\t"
"movaps %%xmm0, (%0, %%"REG_S") \n\t"
"addl $16, %%"REG_S" \n\t"
@@ -258,17 +258,17 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq (%0, %%"REG_S"), %%mm0 \n\t"
+ "movq (%0, %%"REG_S"), %%mm0 \n\t"
"movq 8(%0, %%"REG_S"), %%mm1 \n\t"
- "movq 1024(%0, %%"REG_S"), %%mm2 \n\t"
+ "movq 1024(%0, %%"REG_S"), %%mm2 \n\t"
"movq 1032(%0, %%"REG_S"), %%mm3 \n\t"
- "pfadd 2048(%0, %%"REG_S"), %%mm0 \n\t"
+ "pfadd 2048(%0, %%"REG_S"), %%mm0 \n\t"
"pfadd 2056(%0, %%"REG_S"), %%mm1 \n\t"
- "pfadd 3072(%0, %%"REG_S"), %%mm2 \n\t"
+ "pfadd 3072(%0, %%"REG_S"), %%mm2 \n\t"
"pfadd 3080(%0, %%"REG_S"), %%mm3 \n\t"
"pfadd %%mm7, %%mm0 \n\t"
"pfadd %%mm7, %%mm1 \n\t"
- "pfadd 4096(%0, %%"REG_S"), %%mm2 \n\t"
+ "pfadd 4096(%0, %%"REG_S"), %%mm2 \n\t"
"pfadd 4104(%0, %%"REG_S"), %%mm3 \n\t"
"pfadd %%mm2, %%mm0 \n\t"
"pfadd %%mm3, %%mm1 \n\t"
@@ -304,9 +304,9 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
"addps %%xmm7, %%xmm0 \n\t" //common
- "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
"movaps 2048(%0, %%"REG_S"), %%xmm2 \n\t"
"addps %%xmm0, %%xmm1 \n\t"
"addps %%xmm0, %%xmm2 \n\t"
@@ -328,11 +328,11 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq 1024(%0, %%"REG_S"), %%mm0 \n\t"
+ "movq 1024(%0, %%"REG_S"), %%mm0 \n\t"
"movq 1032(%0, %%"REG_S"), %%mm1 \n\t"
"pfadd %%mm7, %%mm0 \n\t" //common
"pfadd %%mm7, %%mm1 \n\t" //common
- "movq (%0, %%"REG_S"), %%mm2 \n\t"
+ "movq (%0, %%"REG_S"), %%mm2 \n\t"
"movq 8(%0, %%"REG_S"), %%mm3 \n\t"
"movq 2048(%0, %%"REG_S"), %%mm4 \n\t"
"movq 2056(%0, %%"REG_S"), %%mm5 \n\t"
@@ -377,9 +377,9 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps 1024(%1, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 1024(%1, %%"REG_S"), %%xmm0 \n\t"
"addps %%xmm7, %%xmm0 \n\t" //common
- "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
"movaps (%1, %%"REG_S"), %%xmm2 \n\t"
"addps %%xmm0, %%xmm1 \n\t"
"addps %%xmm0, %%xmm2 \n\t"
@@ -401,11 +401,11 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq 1024(%1, %%"REG_S"), %%mm0 \n\t"
+ "movq 1024(%1, %%"REG_S"), %%mm0 \n\t"
"movq 1032(%1, %%"REG_S"), %%mm1 \n\t"
"pfadd %%mm7, %%mm0 \n\t" //common
"pfadd %%mm7, %%mm1 \n\t" //common
- "movq (%0, %%"REG_S"), %%mm2 \n\t"
+ "movq (%0, %%"REG_S"), %%mm2 \n\t"
"movq 8(%0, %%"REG_S"), %%mm3 \n\t"
"movq (%1, %%"REG_S"), %%mm4 \n\t"
"movq 8(%1, %%"REG_S"), %%mm5 \n\t"
@@ -451,7 +451,7 @@
".balign 16\n\t"
"1: \n\t"
"movaps 2048(%0, %%"REG_S"), %%xmm0 \n\t" // surround
- "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm2 \n\t"
"addps %%xmm7, %%xmm1 \n\t"
"addps %%xmm7, %%xmm2 \n\t"
@@ -477,7 +477,7 @@
"1: \n\t"
"movq 2048(%0, %%"REG_S"), %%mm0 \n\t" // surround
"movq 2056(%0, %%"REG_S"), %%mm1 \n\t" // surround
- "movq (%0, %%"REG_S"), %%mm2 \n\t"
+ "movq (%0, %%"REG_S"), %%mm2 \n\t"
"movq 8(%0, %%"REG_S"), %%mm3 \n\t"
"movq 1024(%0, %%"REG_S"), %%mm4 \n\t"
"movq 1032(%0, %%"REG_S"), %%mm5 \n\t"
@@ -526,10 +526,10 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
- "addps 3072(%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
+ "addps 3072(%0, %%"REG_S"), %%xmm0 \n\t"
"addps %%xmm7, %%xmm0 \n\t" // common
- "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
"movaps 2048(%0, %%"REG_S"), %%xmm2 \n\t"
"addps %%xmm0, %%xmm1 \n\t"
"addps %%xmm0, %%xmm2 \n\t"
@@ -551,13 +551,13 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq 1024(%0, %%"REG_S"), %%mm0 \n\t"
+ "movq 1024(%0, %%"REG_S"), %%mm0 \n\t"
"movq 1032(%0, %%"REG_S"), %%mm1 \n\t"
- "pfadd 3072(%0, %%"REG_S"), %%mm0 \n\t"
+ "pfadd 3072(%0, %%"REG_S"), %%mm0 \n\t"
"pfadd 3080(%0, %%"REG_S"), %%mm1 \n\t"
"pfadd %%mm7, %%mm0 \n\t" // common
"pfadd %%mm7, %%mm1 \n\t" // common
- "movq (%0, %%"REG_S"), %%mm2 \n\t"
+ "movq (%0, %%"REG_S"), %%mm2 \n\t"
"movq 8(%0, %%"REG_S"), %%mm3 \n\t"
"movq 2048(%0, %%"REG_S"), %%mm4 \n\t"
"movq 2056(%0, %%"REG_S"), %%mm5 \n\t"
@@ -602,10 +602,10 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
"movaps 3072(%0, %%"REG_S"), %%xmm3 \n\t" // surround
"addps %%xmm7, %%xmm0 \n\t" // common
- "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
"movaps 2048(%0, %%"REG_S"), %%xmm2 \n\t"
"addps %%xmm0, %%xmm1 \n\t"
"addps %%xmm0, %%xmm2 \n\t"
@@ -629,13 +629,13 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq 1024(%0, %%"REG_S"), %%mm0 \n\t"
+ "movq 1024(%0, %%"REG_S"), %%mm0 \n\t"
"movq 1032(%0, %%"REG_S"), %%mm1 \n\t"
- "pfadd 3072(%0, %%"REG_S"), %%mm0 \n\t"
+ "pfadd 3072(%0, %%"REG_S"), %%mm0 \n\t"
"pfadd 3080(%0, %%"REG_S"), %%mm1 \n\t"
"pfadd %%mm7, %%mm0 \n\t" // common
"pfadd %%mm7, %%mm1 \n\t" // common
- "movq (%0, %%"REG_S"), %%mm2 \n\t"
+ "movq (%0, %%"REG_S"), %%mm2 \n\t"
"movq 8(%0, %%"REG_S"), %%mm3 \n\t"
"movq 2048(%0, %%"REG_S"), %%mm4 \n\t"
"movq 2056(%0, %%"REG_S"), %%mm5 \n\t"
@@ -681,9 +681,9 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps 2048(%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 2048(%0, %%"REG_S"), %%xmm0 \n\t"
"addps 3072(%0, %%"REG_S"), %%xmm0 \n\t" // surround
- "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
+ "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
"movaps 1024(%0, %%"REG_S"), %%xmm2 \n\t"
"addps %%xmm7, %%xmm1 \n\t"
"addps %%xmm7, %%xmm2 \n\t"
@@ -707,11 +707,11 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq 2048(%0, %%"REG_S"), %%mm0 \n\t"
+ "movq 2048(%0, %%"REG_S"), %%mm0 \n\t"
"movq 2056(%0, %%"REG_S"), %%mm1 \n\t"
"pfadd 3072(%0, %%"REG_S"), %%mm0 \n\t" // surround
"pfadd 3080(%0, %%"REG_S"), %%mm1 \n\t" // surround
- "movq (%0, %%"REG_S"), %%mm2 \n\t"
+ "movq (%0, %%"REG_S"), %%mm2 \n\t"
"movq 8(%0, %%"REG_S"), %%mm3 \n\t"
"movq 1024(%0, %%"REG_S"), %%mm4 \n\t"
"movq 1032(%0, %%"REG_S"), %%mm5 \n\t"
@@ -760,13 +760,13 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
"addps %%xmm7, %%xmm0 \n\t" // common
"movaps %%xmm0, %%xmm1 \n\t" // common
- "addps (%0, %%"REG_S"), %%xmm0 \n\t"
- "addps 2048(%0, %%"REG_S"), %%xmm1 \n\t"
- "addps 3072(%0, %%"REG_S"), %%xmm0 \n\t"
- "addps 4096(%0, %%"REG_S"), %%xmm1 \n\t"
+ "addps (%0, %%"REG_S"), %%xmm0 \n\t"
+ "addps 2048(%0, %%"REG_S"), %%xmm1 \n\t"
+ "addps 3072(%0, %%"REG_S"), %%xmm0 \n\t"
+ "addps 4096(%0, %%"REG_S"), %%xmm1 \n\t"
"movaps %%xmm0, (%0, %%"REG_S") \n\t"
"movaps %%xmm1, 1024(%0, %%"REG_S") \n\t"
"addl $16, %%"REG_S" \n\t"
@@ -785,19 +785,19 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movq 1024(%0, %%"REG_S"), %%mm0 \n\t"
+ "movq 1024(%0, %%"REG_S"), %%mm0 \n\t"
"movq 1032(%0, %%"REG_S"), %%mm1 \n\t"
"pfadd %%mm7, %%mm0 \n\t" // common
"pfadd %%mm7, %%mm1 \n\t" // common
"movq %%mm0, %%mm2 \n\t" // common
"movq %%mm1, %%mm3 \n\t" // common
- "pfadd (%0, %%"REG_S"), %%mm0 \n\t"
+ "pfadd (%0, %%"REG_S"), %%mm0 \n\t"
"pfadd 8(%0, %%"REG_S"), %%mm1 \n\t"
- "pfadd 2048(%0, %%"REG_S"), %%mm2 \n\t"
+ "pfadd 2048(%0, %%"REG_S"), %%mm2 \n\t"
"pfadd 2056(%0, %%"REG_S"), %%mm3 \n\t"
- "pfadd 3072(%0, %%"REG_S"), %%mm0 \n\t"
+ "pfadd 3072(%0, %%"REG_S"), %%mm0 \n\t"
"pfadd 3080(%0, %%"REG_S"), %%mm1 \n\t"
- "pfadd 4096(%0, %%"REG_S"), %%mm2 \n\t"
+ "pfadd 4096(%0, %%"REG_S"), %%mm2 \n\t"
"pfadd 4104(%0, %%"REG_S"), %%mm3 \n\t"
"movq %%mm0, (%0, %%"REG_S") \n\t"
"movq %%mm1, 8(%0, %%"REG_S") \n\t"
@@ -836,16 +836,16 @@
"movl $-1024, %%"REG_S" \n\t"
".balign 16\n\t"
"1: \n\t"
- "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
- "movaps 3072(%0, %%"REG_S"), %%xmm2 \n\t"
+ "movaps 1024(%0, %%"REG_S"), %%xmm0 \n\t"
+ "movaps 3072(%0, %%"REG_S"), %%xmm2 \n\t"
"addps %%xmm7, %%xmm0 \n\t" // common
- "addps 4096(%0, %%"REG_S"), %%xmm2 \n\t" // surround
- "movaps (%0, %%"REG_S"), %%xmm1 \n\t"
- "movaps 2048(%0,...
[truncated message content] |
