[MPlayer-cvslog] r29305 - in trunk: DOCS/README DOCS/man/cs/mplayer.1 DOCS/man/en/mplayer.1 DOCS/man/es/mplayer.1 DOCS/man/it/mplayer.1 DOCS/man/pl/mplayer.1 DOCS/man/ru/mplayer.1 DOCS/man/zh_CN/mplayer.1 DOCS/tech...

diego subversion at mplayerhq.hu
Wed May 13 04:59:03 CEST 2009


Author: diego
Date: Wed May 13 04:58:57 2009
New Revision: 29305

Log:
whitespace cosmetics: Remove all trailing whitespace.

Modified:
   trunk/DOCS/README
   trunk/DOCS/tech/Doxyfile
   trunk/DOCS/tech/TODO
   trunk/DOCS/tech/codec-devel.txt
   trunk/DOCS/tech/dr-methods.txt
   trunk/DOCS/tech/encoding-tips.txt
   trunk/DOCS/tech/formats.txt
   trunk/DOCS/tech/general.txt
   trunk/DOCS/tech/hwac3.txt
   trunk/DOCS/tech/libao2.txt
   trunk/DOCS/tech/libvo.txt
   trunk/DOCS/tech/mingw-crosscompile.txt
   trunk/DOCS/tech/new_policy_proposal.txt
   trunk/DOCS/tech/playtree
   trunk/DOCS/tech/realcodecs/TODO
   trunk/DOCS/tech/realcodecs/audio-codecs.txt
   trunk/DOCS/tech/realcodecs/video-codecs.txt
   trunk/DOCS/tech/slave.txt
   trunk/DOCS/tech/snow.txt
   trunk/DOCS/tech/subcp.txt
   trunk/DOCS/tech/swscaler_methods.txt
   trunk/DOCS/tech/vidix.txt
   trunk/DOCS/xml/xsl/ldp-html-chunk.xsl
   trunk/DOCS/xml/xsl/ldp-html-common.xsl
   trunk/DOCS/xml/xsl/ldp-html.xsl
   trunk/TOOLS/aconvert.sh
   trunk/TOOLS/bmovl-test.c
   trunk/TOOLS/calcbpp.pl
   trunk/TOOLS/divx2svcd.sh
   trunk/TOOLS/mencvcd.sh
   trunk/TOOLS/modify_reg.c
   trunk/TOOLS/movinfo.c
   trunk/TOOLS/netstream.c
   trunk/TOOLS/plotpsnr.pl
   trunk/TOOLS/qepdvcd.sh
   trunk/TOOLS/realcodecs/14_4.c
   trunk/TOOLS/realcodecs/28_8.c
   trunk/TOOLS/realcodecs/cook.c
   trunk/TOOLS/realcodecs/drv2.c
   trunk/TOOLS/realcodecs/drv3.c
   trunk/TOOLS/realcodecs/drv4.c
   trunk/TOOLS/realcodecs/ra.c
   trunk/TOOLS/realcodecs/rv30.c
   trunk/TOOLS/realcodecs/sipr.c
   trunk/TOOLS/subrip.c
   trunk/TOOLS/vivodump.c
   trunk/TOOLS/vobshift.py
   trunk/TOOLS/w32codec_dl.pl
   trunk/asxparser.c
   trunk/asxparser.h
   trunk/cfg-common-opts.h
   trunk/cfg-common.h
   trunk/cfg-mencoder.h
   trunk/cfg-mplayer.h
   trunk/codec-cfg.c
   trunk/command.c
   trunk/cpudetect.c
   trunk/debian/README.debian
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
   trunk/drivers/3dfx.h
   trunk/drivers/hacking.ati
   trunk/drivers/mga_vid.c
   trunk/drivers/mga_vid_test.c
   trunk/drivers/radeon.h
   trunk/drivers/radeon_vid.c
   trunk/drivers/tdfx_vid.c
   trunk/drivers/tdfx_vid.h
   trunk/drivers/tdfx_vid_test.c
   trunk/edl.c
   trunk/etc/codecs.conf
   trunk/etc/input.conf
   trunk/etc/menu.conf
   trunk/find_sub.c
   trunk/gui/app.c
   trunk/gui/app.h
   trunk/gui/bitmap.c
   trunk/gui/cfg.c
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/mplayer/gtk/about.c
   trunk/gui/mplayer/gtk/eq.c
   trunk/gui/mplayer/gtk/gtk_common.c
   trunk/gui/mplayer/gtk/gtk_url.c
   trunk/gui/mplayer/gtk/mb.c
   trunk/gui/mplayer/gtk/menu.c
   trunk/gui/mplayer/gtk/opts.c
   trunk/gui/mplayer/gtk/pl.c
   trunk/gui/mplayer/gtk/sb.c
   trunk/gui/mplayer/gui_common.c
   trunk/gui/mplayer/mw.c
   trunk/gui/mplayer/pb.c
   trunk/gui/mplayer/play.c
   trunk/gui/mplayer/sw.c
   trunk/gui/mplayer/widgets.c
   trunk/gui/skin/cut.c
   trunk/gui/skin/font.c
   trunk/gui/skin/skin.c
   trunk/gui/wm/ws.c
   trunk/gui/wm/wsxdnd.c
   trunk/input/appleir.c
   trunk/input/input.c
   trunk/input/input.h
   trunk/input/joystick.c
   trunk/input/lirc.c
   trunk/input/lirc.h
   trunk/libaf/af.c
   trunk/libaf/af.h
   trunk/libaf/af_center.c
   trunk/libaf/af_channels.c
   trunk/libaf/af_comp.c
   trunk/libaf/af_delay.c
   trunk/libaf/af_dummy.c
   trunk/libaf/af_equalizer.c
   trunk/libaf/af_export.c
   trunk/libaf/af_extrastereo.c
   trunk/libaf/af_format.c
   trunk/libaf/af_format_alaw.h
   trunk/libaf/af_format_ulaw.h
   trunk/libaf/af_gate.c
   trunk/libaf/af_hrtf.c
   trunk/libaf/af_karaoke.c
   trunk/libaf/af_ladspa.c
   trunk/libaf/af_lavcresample.c
   trunk/libaf/af_pan.c
   trunk/libaf/af_resample.c
   trunk/libaf/af_resample_template.c
   trunk/libaf/af_sinesuppress.c
   trunk/libaf/af_sub.c
   trunk/libaf/af_surround.c
   trunk/libaf/af_sweep.c
   trunk/libaf/af_tools.c
   trunk/libaf/af_volnorm.c
   trunk/libaf/af_volume.c
   trunk/libaf/control.h
   trunk/libaf/equalizer.h
   trunk/libaf/filter.c
   trunk/libaf/filter.h
   trunk/libaf/format.c
   trunk/libaf/window.c
   trunk/libao2/ao_alsa.c
   trunk/libao2/ao_alsa5.c
   trunk/libao2/ao_coreaudio.c
   trunk/libao2/ao_dsound.c
   trunk/libao2/ao_dxr2.c
   trunk/libao2/ao_esd.c
   trunk/libao2/ao_ivtv.c
   trunk/libao2/ao_jack.c
   trunk/libao2/ao_mpegpes.c
   trunk/libao2/ao_nas.c
   trunk/libao2/ao_null.c
   trunk/libao2/ao_openal.c
   trunk/libao2/ao_oss.c
   trunk/libao2/ao_pcm.c
   trunk/libao2/ao_sdl.c
   trunk/libao2/ao_sgi.c
   trunk/libao2/ao_sun.c
   trunk/libao2/ao_v4l2.c
   trunk/libao2/ao_win32.c
   trunk/libao2/audio_out.h
   trunk/libass/ass.c
   trunk/libass/ass.h
   trunk/libass/ass_bitmap.c
   trunk/libass/ass_cache.c
   trunk/libass/ass_cache.h
   trunk/libass/ass_font.c
   trunk/libass/ass_fontconfig.c
   trunk/libass/ass_library.c
   trunk/libass/ass_mp.c
   trunk/libass/ass_render.c
   trunk/libass/ass_types.h
   trunk/libass/ass_utils.c
   trunk/libmenu/menu.c
   trunk/libmenu/menu.h
   trunk/libmenu/menu_chapsel.c
   trunk/libmenu/menu_cmdlist.c
   trunk/libmenu/menu_console.c
   trunk/libmenu/menu_dvbin.c
   trunk/libmenu/menu_filesel.c
   trunk/libmenu/menu_list.c
   trunk/libmenu/menu_list.h
   trunk/libmenu/menu_param.c
   trunk/libmenu/menu_pt.c
   trunk/libmenu/menu_txt.c
   trunk/libmenu/vf_menu.c
   trunk/libmpcodecs/ad_acm.c
   trunk/libmpcodecs/ad_alaw.c
   trunk/libmpcodecs/ad_dk3adpcm.c
   trunk/libmpcodecs/ad_dmo.c
   trunk/libmpcodecs/ad_dshow.c
   trunk/libmpcodecs/ad_dvdpcm.c
   trunk/libmpcodecs/ad_faad.c
   trunk/libmpcodecs/ad_ffmpeg.c
   trunk/libmpcodecs/ad_hwac3.c
   trunk/libmpcodecs/ad_hwmpa.c
   trunk/libmpcodecs/ad_imaadpcm.c
   trunk/libmpcodecs/ad_liba52.c
   trunk/libmpcodecs/ad_libdv.c
   trunk/libmpcodecs/ad_libmad.c
   trunk/libmpcodecs/ad_libvorbis.c
   trunk/libmpcodecs/ad_mp3lib.c
   trunk/libmpcodecs/ad_mpc.c
   trunk/libmpcodecs/ad_msadpcm.c
   trunk/libmpcodecs/ad_msgsm.c
   trunk/libmpcodecs/ad_pcm.c
   trunk/libmpcodecs/ad_qtaudio.c
   trunk/libmpcodecs/ad_realaud.c
   trunk/libmpcodecs/ad_sample.c
   trunk/libmpcodecs/ad_twin.c
   trunk/libmpcodecs/ae.c
   trunk/libmpcodecs/ae_faac.c
   trunk/libmpcodecs/ae_lame.c
   trunk/libmpcodecs/ae_lavc.c
   trunk/libmpcodecs/ae_pcm.c
   trunk/libmpcodecs/ae_toolame.c
   trunk/libmpcodecs/ae_twolame.c
   trunk/libmpcodecs/mp_image.c
   trunk/libmpcodecs/native/rtjpegn.c
   trunk/libmpcodecs/native/rtjpegn.h
   trunk/libmpcodecs/native/xa_gsm.c
   trunk/libmpcodecs/native/xa_gsm_int.h
   trunk/libmpcodecs/pullup.c
   trunk/libmpcodecs/vd.c
   trunk/libmpcodecs/vd_dmo.c
   trunk/libmpcodecs/vd_dshow.c
   trunk/libmpcodecs/vd_hmblck.c
   trunk/libmpcodecs/vd_libdv.c
   trunk/libmpcodecs/vd_libmpeg2.c
   trunk/libmpcodecs/vd_lzo.c
   trunk/libmpcodecs/vd_mpegpes.c
   trunk/libmpcodecs/vd_mpng.c
   trunk/libmpcodecs/vd_mtga.c
   trunk/libmpcodecs/vd_null.c
   trunk/libmpcodecs/vd_qtvideo.c
   trunk/libmpcodecs/vd_raw.c
   trunk/libmpcodecs/vd_realvid.c
   trunk/libmpcodecs/vd_sgi.c
   trunk/libmpcodecs/vd_theora.c
   trunk/libmpcodecs/vd_vfw.c
   trunk/libmpcodecs/vd_xanim.c
   trunk/libmpcodecs/vd_xvid4.c
   trunk/libmpcodecs/vd_zrmjpeg.c
   trunk/libmpcodecs/ve_lavc.c
   trunk/libmpcodecs/ve_libdv.c
   trunk/libmpcodecs/ve_nuv.c
   trunk/libmpcodecs/ve_qtvideo.c
   trunk/libmpcodecs/ve_raw.c
   trunk/libmpcodecs/ve_vfw.c
   trunk/libmpcodecs/ve_x264.c
   trunk/libmpcodecs/ve_xvid4.c
   trunk/libmpcodecs/vf.c
   trunk/libmpcodecs/vf.h
   trunk/libmpcodecs/vf_1bpp.c
   trunk/libmpcodecs/vf_2xsai.c
   trunk/libmpcodecs/vf_ass.c
   trunk/libmpcodecs/vf_bmovl.c
   trunk/libmpcodecs/vf_boxblur.c
   trunk/libmpcodecs/vf_crop.c
   trunk/libmpcodecs/vf_cropdetect.c
   trunk/libmpcodecs/vf_decimate.c
   trunk/libmpcodecs/vf_delogo.c
   trunk/libmpcodecs/vf_detc.c
   trunk/libmpcodecs/vf_dvbscale.c
   trunk/libmpcodecs/vf_eq.c
   trunk/libmpcodecs/vf_eq2.c
   trunk/libmpcodecs/vf_expand.c
   trunk/libmpcodecs/vf_field.c
   trunk/libmpcodecs/vf_fil.c
   trunk/libmpcodecs/vf_filmdint.c
   trunk/libmpcodecs/vf_flip.c
   trunk/libmpcodecs/vf_format.c
   trunk/libmpcodecs/vf_fspp.c
   trunk/libmpcodecs/vf_halfpack.c
   trunk/libmpcodecs/vf_harddup.c
   trunk/libmpcodecs/vf_hqdn3d.c
   trunk/libmpcodecs/vf_hue.c
   trunk/libmpcodecs/vf_il.c
   trunk/libmpcodecs/vf_ilpack.c
   trunk/libmpcodecs/vf_ivtc.c
   trunk/libmpcodecs/vf_lavc.c
   trunk/libmpcodecs/vf_lavcdeint.c
   trunk/libmpcodecs/vf_mcdeint.c
   trunk/libmpcodecs/vf_mirror.c
   trunk/libmpcodecs/vf_noformat.c
   trunk/libmpcodecs/vf_noise.c
   trunk/libmpcodecs/vf_ow.c
   trunk/libmpcodecs/vf_palette.c
   trunk/libmpcodecs/vf_perspective.c
   trunk/libmpcodecs/vf_phase.c
   trunk/libmpcodecs/vf_pp.c
   trunk/libmpcodecs/vf_pp7.c
   trunk/libmpcodecs/vf_pullup.c
   trunk/libmpcodecs/vf_qp.c
   trunk/libmpcodecs/vf_rectangle.c
   trunk/libmpcodecs/vf_remove_logo.c
   trunk/libmpcodecs/vf_rgb2bgr.c
   trunk/libmpcodecs/vf_rgbtest.c
   trunk/libmpcodecs/vf_rotate.c
   trunk/libmpcodecs/vf_sab.c
   trunk/libmpcodecs/vf_scale.c
   trunk/libmpcodecs/vf_smartblur.c
   trunk/libmpcodecs/vf_softskip.c
   trunk/libmpcodecs/vf_spp.c
   trunk/libmpcodecs/vf_swapuv.c
   trunk/libmpcodecs/vf_telecine.c
   trunk/libmpcodecs/vf_tfields.c
   trunk/libmpcodecs/vf_tinterlace.c
   trunk/libmpcodecs/vf_unsharp.c
   trunk/libmpcodecs/vf_uspp.c
   trunk/libmpcodecs/vf_yuvcsp.c
   trunk/libmpcodecs/vf_yuy2.c
   trunk/libmpcodecs/vf_yvu9.c
   trunk/libmpcodecs/vqf.h
   trunk/libmpdemux/aac_hdr.c
   trunk/libmpdemux/asf.h
   trunk/libmpdemux/asfguid.h
   trunk/libmpdemux/asfheader.c
   trunk/libmpdemux/aviheader.c
   trunk/libmpdemux/aviheader.h
   trunk/libmpdemux/aviprint.c
   trunk/libmpdemux/demux_aac.c
   trunk/libmpdemux/demux_asf.c
   trunk/libmpdemux/demux_audio.c
   trunk/libmpdemux/demux_avi.c
   trunk/libmpdemux/demux_avs.c
   trunk/libmpdemux/demux_avs.h
   trunk/libmpdemux/demux_demuxers.c
   trunk/libmpdemux/demux_film.c
   trunk/libmpdemux/demux_fli.c
   trunk/libmpdemux/demux_gif.c
   trunk/libmpdemux/demux_lmlm4.c
   trunk/libmpdemux/demux_mf.c
   trunk/libmpdemux/demux_mkv.c
   trunk/libmpdemux/demux_mov.c
   trunk/libmpdemux/demux_mpg.c
   trunk/libmpdemux/demux_nemesi.c
   trunk/libmpdemux/demux_nsv.c
   trunk/libmpdemux/demux_ogg.c
   trunk/libmpdemux/demux_pva.c
   trunk/libmpdemux/demux_real.c
   trunk/libmpdemux/demux_realaud.c
   trunk/libmpdemux/demux_roq.c
   trunk/libmpdemux/demux_rtp.cpp
   trunk/libmpdemux/demux_rtp_codec.cpp
   trunk/libmpdemux/demux_smjpeg.c
   trunk/libmpdemux/demux_ts.c
   trunk/libmpdemux/demux_ty_osd.c
   trunk/libmpdemux/demux_viv.c
   trunk/libmpdemux/demux_vqf.c
   trunk/libmpdemux/demux_xmms_plugin.h
   trunk/libmpdemux/demux_y4m.c
   trunk/libmpdemux/demuxer.h
   trunk/libmpdemux/genres.h
   trunk/libmpdemux/mf.c
   trunk/libmpdemux/mp3_hdr.c
   trunk/libmpdemux/mp3_hdr.h
   trunk/libmpdemux/mpeg_hdr.c
   trunk/libmpdemux/mpeg_packetizer.c
   trunk/libmpdemux/mpeg_packetizer.h
   trunk/libmpdemux/muxer.c
   trunk/libmpdemux/muxer_avi.c
   trunk/libmpdemux/muxer_lavf.c
   trunk/libmpdemux/muxer_mpeg.c
   trunk/libmpdemux/parse_es.c
   trunk/libmpdemux/parse_mp4.c
   trunk/libmpdemux/parse_mp4.h
   trunk/libmpdemux/qtpalette.h
   trunk/libmpdemux/video.c
   trunk/libmpdemux/yuv4mpeg.c
   trunk/libmpdemux/yuv4mpeg_intern.h
   trunk/libmpdemux/yuv4mpeg_ratio.c
   trunk/libvo/aspecttest.c
   trunk/libvo/font_load.c
   trunk/libvo/font_load.h
   trunk/libvo/font_load_ft.c
   trunk/libvo/geometry.c
   trunk/libvo/gl_common.c
   trunk/libvo/gl_common.h
   trunk/libvo/gtf.c
   trunk/libvo/gtf.h
   trunk/libvo/jpeg_enc.c
   trunk/libvo/jpeg_enc.h
   trunk/libvo/mga_common.c
   trunk/libvo/osd_template.c
   trunk/libvo/spuenc.c
   trunk/libvo/sub.c
   trunk/libvo/vesa_lvo.c
   trunk/libvo/videodev_mjpeg.h
   trunk/libvo/vo_3dfx.c
   trunk/libvo/vo_aa.c
   trunk/libvo/vo_bl.c
   trunk/libvo/vo_caca.c
   trunk/libvo/vo_corevideo.h
   trunk/libvo/vo_corevideo.m
   trunk/libvo/vo_cvidix.c
   trunk/libvo/vo_dga.c
   trunk/libvo/vo_directfb2.c
   trunk/libvo/vo_directx.c
   trunk/libvo/vo_dxr2.c
   trunk/libvo/vo_dxr3.c
   trunk/libvo/vo_fbdev2.c
   trunk/libvo/vo_gif89a.c
   trunk/libvo/vo_gl.c
   trunk/libvo/vo_ivtv.c
   trunk/libvo/vo_jpeg.c
   trunk/libvo/vo_md5sum.c
   trunk/libvo/vo_mga.c
   trunk/libvo/vo_mpegpes.c
   trunk/libvo/vo_null.c
   trunk/libvo/vo_png.c
   trunk/libvo/vo_pnm.c
   trunk/libvo/vo_quartz.c
   trunk/libvo/vo_quartz.h
   trunk/libvo/vo_s3fb.c
   trunk/libvo/vo_sdl.c
   trunk/libvo/vo_tdfx_vid.c
   trunk/libvo/vo_v4l2.c
   trunk/libvo/vo_vdpau.c
   trunk/libvo/vo_vesa.c
   trunk/libvo/vo_winvidix.c
   trunk/libvo/vo_x11.c
   trunk/libvo/vo_xover.c
   trunk/libvo/vo_xv.c
   trunk/libvo/vo_yuv4mpeg.c
   trunk/libvo/vo_zr.c
   trunk/libvo/vo_zr2.c
   trunk/libvo/vosub_vidix.c
   trunk/libvo/w32_common.c
   trunk/libvo/x11_common.c
   trunk/loader/afl.c
   trunk/loader/com.h
   trunk/loader/dmo/DMO_AudioDecoder.c
   trunk/loader/dmo/DMO_VideoDecoder.c
   trunk/loader/dshow/DS_AudioDecoder.c
   trunk/loader/dshow/DS_Filter.c
   trunk/loader/dshow/DS_VideoDecoder.c
   trunk/loader/dshow/allocator.c
   trunk/loader/dshow/cmediasample.c
   trunk/loader/dshow/inputpin.c
   trunk/loader/dshow/libwin32.h
   trunk/loader/dshow/mediatype.c
   trunk/loader/dshow/mediatype.h
   trunk/loader/dshow/outputpin.c
   trunk/loader/elfdll.c
   trunk/loader/ext.c
   trunk/loader/ldt_keeper.c
   trunk/loader/module.c
   trunk/loader/pe_image.c
   trunk/loader/pe_resource.c
   trunk/loader/qtx/list.c
   trunk/loader/qtx/qtxload.c
   trunk/loader/qtx/qtxsdk/components.h
   trunk/loader/resource.c
   trunk/loader/vfl.c
   trunk/loader/win32.c
   trunk/loader/wine/avifmt.h
   trunk/loader/wine/driver.h
   trunk/loader/wine/ldt.h
   trunk/loader/wine/mmreg.h
   trunk/loader/wine/module.h
   trunk/loader/wine/msacm.h
   trunk/loader/wine/msacmdrv.h
   trunk/loader/wine/ntdef.h
   trunk/loader/wine/vfw.h
   trunk/loader/wine/winbase.h
   trunk/loader/wine/windef.h
   trunk/loader/wine/winnt.h
   trunk/loader/wine/winreg.h
   trunk/loader/wine/winuser.h
   trunk/loader/wrapper.S
   trunk/m_config.c
   trunk/m_config.h
   trunk/m_option.c
   trunk/m_option.h
   trunk/m_property.c
   trunk/m_property.h
   trunk/m_struct.c
   trunk/mencoder.c
   trunk/mixer.c
   trunk/mp3lib/dct12.c
   trunk/mp3lib/dct36.c
   trunk/mp3lib/dct64_altivec.c
   trunk/mp3lib/decod386.c
   trunk/mp3lib/huffman.h
   trunk/mp3lib/l2tables.h
   trunk/mp3lib/layer1.c
   trunk/mp3lib/layer2.c
   trunk/mp3lib/layer3.c
   trunk/mp3lib/sr1.c
   trunk/mp3lib/test.c
   trunk/mp3lib/test2.c
   trunk/mp_msg.c
   trunk/mpcommon.c
   trunk/mplayer.c
   trunk/osdep/getch2-win.c
   trunk/osdep/glob-win.c
   trunk/osdep/keycodes.h
   trunk/osdep/macosx_finder_args.c
   trunk/osdep/mmap_anon.c
   trunk/osdep/mplayer.rc
   trunk/osdep/strsep.c
   trunk/osdep/timer-darwin.c
   trunk/osdep/timer-win2.c
   trunk/parser-cfg.c
   trunk/parser-mecmd.c
   trunk/parser-mpcmd.c
   trunk/playtree.c
   trunk/playtree.h
   trunk/playtreeparser.c
   trunk/rpm/mplayer.spec
   trunk/spudec.c
   trunk/stream/ai_alsa.c
   trunk/stream/ai_alsa1x.c
   trunk/stream/ai_oss.c
   trunk/stream/asf_mmst_streaming.c
   trunk/stream/asf_streaming.c
   trunk/stream/audio_in.c
   trunk/stream/audio_in.h
   trunk/stream/cache2.c
   trunk/stream/cdd.h
   trunk/stream/cdinfo.c
   trunk/stream/cookies.c
   trunk/stream/cookies.h
   trunk/stream/dvb_tune.c
   trunk/stream/freesdp/common.h
   trunk/stream/freesdp/parser.c
   trunk/stream/freesdp/parser.h
   trunk/stream/freesdp/parserpriv.h
   trunk/stream/freesdp/priv.h
   trunk/stream/frequencies.c
   trunk/stream/frequencies.h
   trunk/stream/http.c
   trunk/stream/http.h
   trunk/stream/librtsp/rtsp.c
   trunk/stream/librtsp/rtsp.h
   trunk/stream/librtsp/rtsp_rtp.c
   trunk/stream/librtsp/rtsp_session.c
   trunk/stream/network.c
   trunk/stream/open.c
   trunk/stream/pnm.c
   trunk/stream/pnm.h
   trunk/stream/pvr.h
   trunk/stream/realrtsp/asmrp.c
   trunk/stream/realrtsp/real.c
   trunk/stream/realrtsp/real.h
   trunk/stream/realrtsp/rmff.c
   trunk/stream/realrtsp/rmff.h
   trunk/stream/realrtsp/sdpplin.c
   trunk/stream/realrtsp/sdpplin.h
   trunk/stream/realrtsp/xbuffer.c
   trunk/stream/realrtsp/xbuffer.h
   trunk/stream/rtp.c
   trunk/stream/stream.c
   trunk/stream/stream.h
   trunk/stream/stream_cdda.c
   trunk/stream/stream_cddb.c
   trunk/stream/stream_cue.c
   trunk/stream/stream_dvb.c
   trunk/stream/stream_dvd.c
   trunk/stream/stream_dvd_common.c
   trunk/stream/stream_dvdnav.c
   trunk/stream/stream_file.c
   trunk/stream/stream_ftp.c
   trunk/stream/stream_live555.c
   trunk/stream/stream_mf.c
   trunk/stream/stream_netstream.c
   trunk/stream/stream_netstream.h
   trunk/stream/stream_pvr.c
   trunk/stream/stream_radio.c
   trunk/stream/stream_rtp.c
   trunk/stream/stream_rtsp.c
   trunk/stream/stream_smb.c
   trunk/stream/stream_tv.c
   trunk/stream/stream_udp.c
   trunk/stream/stream_vcd.c
   trunk/stream/stream_vstream.c
   trunk/stream/tcp.c
   trunk/stream/tv.c
   trunk/stream/tv.h
   trunk/stream/tvi_bsdbt848.c
   trunk/stream/tvi_def.h
   trunk/stream/tvi_dshow.c
   trunk/stream/tvi_dshow.h
   trunk/stream/tvi_v4l.c
   trunk/stream/tvi_v4l2.c
   trunk/stream/tvi_vbi.c
   trunk/stream/udp.c
   trunk/stream/url.c
   trunk/stream/url.h
   trunk/stream/vcd_read.h
   trunk/stream/vcd_read_darwin.h
   trunk/sub_cc.c
   trunk/subopt-helper.h
   trunk/subreader.c
   trunk/subreader.h
   trunk/vidix/AsmMacros.h
   trunk/vidix/cyberblade_vid.c
   trunk/vidix/dha.c
   trunk/vidix/dhahelper/dhahelper.c
   trunk/vidix/dhahelper/test.c
   trunk/vidix/dhahelperwin/dhahelper.c
   trunk/vidix/dhahelperwin/dhasetup.c
   trunk/vidix/drivers.c
   trunk/vidix/glint_regs.h
   trunk/vidix/ivtv_vid.c
   trunk/vidix/mach64.h
   trunk/vidix/mach64_vid.c
   trunk/vidix/mga_vid.c
   trunk/vidix/mtrr.c
   trunk/vidix/nvidia_vid.c
   trunk/vidix/pci.c
   trunk/vidix/pci.db
   trunk/vidix/pci_db2c.awk
   trunk/vidix/pm3_regs.h
   trunk/vidix/pm3_vid.c
   trunk/vidix/radeon_vid.c
   trunk/vidix/s3_regs.h
   trunk/vidix/s3_vid.c
   trunk/vidix/sis_vid.c
   trunk/vidix/sysdep/AsmMacros_x86.h
   trunk/vidix/sysdep/libdha_os2.c
   trunk/vidix/sysdep/libdha_win32.c
   trunk/vidix/sysdep/pci_alpha.c
   trunk/vidix/sysdep/pci_arm32.c
   trunk/vidix/sysdep/pci_ia64.c
   trunk/vidix/sysdep/pci_linux.c
   trunk/vidix/sysdep/pci_lynx.c
   trunk/vidix/sysdep/pci_os2.c
   trunk/vidix/sysdep/pci_powerpc.c
   trunk/vidix/sysdep/pci_sparc.c
   trunk/vidix/sysdep/pci_x86.c
   trunk/vidix/unichrome_regs.h
   trunk/vidix/unichrome_vid.c
   trunk/vidix/vidix.c
   trunk/vobsub.c
   trunk/xvid_vbr.c
   trunk/xvid_vbr.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/cs/mplayer.1
   trunk/DOCS/man/en/mplayer.1
   trunk/DOCS/man/es/mplayer.1
   trunk/DOCS/man/it/mplayer.1
   trunk/DOCS/man/pl/mplayer.1
   trunk/DOCS/man/ru/mplayer.1
   trunk/DOCS/man/zh_CN/mplayer.1
   trunk/DOCS/xml/configure
   trunk/DOCS/xml/cs/documentation.xml
   trunk/DOCS/xml/cs/encoding-guide.xml
   trunk/DOCS/xml/cs/install.xml
   trunk/DOCS/xml/cs/mencoder.xml
   trunk/DOCS/xml/cs/ports.xml
   trunk/DOCS/xml/cs/skin.xml
   trunk/DOCS/xml/cs/video.xml
   trunk/DOCS/xml/de/cd-dvd.xml
   trunk/DOCS/xml/de/documentation.xml
   trunk/DOCS/xml/en/documentation.xml
   trunk/DOCS/xml/en/skin.xml
   trunk/DOCS/xml/es/bugreports.xml
   trunk/DOCS/xml/es/cd-dvd.xml
   trunk/DOCS/xml/es/documentation.xml
   trunk/DOCS/xml/es/faq.xml
   trunk/DOCS/xml/es/install.xml
   trunk/DOCS/xml/es/mencoder.xml
   trunk/DOCS/xml/es/ports.xml
   trunk/DOCS/xml/es/skin.xml
   trunk/DOCS/xml/es/tvinput.xml
   trunk/DOCS/xml/es/usage.xml
   trunk/DOCS/xml/es/video.xml
   trunk/DOCS/xml/fr/documentation.xml
   trunk/DOCS/xml/fr/encoding-guide.xml
   trunk/DOCS/xml/fr/install.xml
   trunk/DOCS/xml/fr/mencoder.xml
   trunk/DOCS/xml/fr/ports.xml
   trunk/DOCS/xml/fr/radio.xml
   trunk/DOCS/xml/fr/tvinput.xml
   trunk/DOCS/xml/fr/video.xml
   trunk/DOCS/xml/html-common.xsl
   trunk/DOCS/xml/hu/documentation.xml
   trunk/DOCS/xml/it/documentation.xml
   trunk/DOCS/xml/it/encoding-guide.xml
   trunk/DOCS/xml/it/faq.xml
   trunk/DOCS/xml/it/install.xml
   trunk/DOCS/xml/it/mencoder.xml
   trunk/DOCS/xml/it/tvinput.xml
   trunk/DOCS/xml/it/video.xml
   trunk/DOCS/xml/ldp.dsl
   trunk/DOCS/xml/pl/bugreports.xml
   trunk/DOCS/xml/pl/cd-dvd.xml
   trunk/DOCS/xml/pl/documentation.xml
   trunk/DOCS/xml/pl/encoding-guide.xml
   trunk/DOCS/xml/pl/faq.xml
   trunk/DOCS/xml/pl/install.xml
   trunk/DOCS/xml/pl/mencoder.xml
   trunk/DOCS/xml/pl/ports.xml
   trunk/DOCS/xml/pl/skin.xml
   trunk/DOCS/xml/pl/usage.xml
   trunk/DOCS/xml/pl/video.xml
   trunk/DOCS/xml/ru/documentation.xml
   trunk/DOCS/xml/ru/install.xml
   trunk/DOCS/xml/ru/mencoder.xml
   trunk/DOCS/xml/ru/ports.xml
   trunk/DOCS/xml/ru/radio.xml
   trunk/DOCS/xml/ru/skin.xml
   trunk/DOCS/xml/ru/tvinput.xml
   trunk/DOCS/xml/ru/usage.xml
   trunk/DOCS/xml/ru/video.xml
   trunk/DOCS/xml/zh_CN/documentation.xml
   trunk/DOCS/xml/zh_CN/mencoder.xml
   trunk/DOCS/xml/zh_CN/radio.xml
   trunk/help/help_mp-bg.h
   trunk/help/help_mp-cs.h
   trunk/help/help_mp-dk.h
   trunk/help/help_mp-es.h
   trunk/help/help_mp-fr.h
   trunk/help/help_mp-hu.h
   trunk/help/help_mp-it.h
   trunk/help/help_mp-ko.h
   trunk/help/help_mp-nl.h
   trunk/help/help_mp-pl.h
   trunk/help/help_mp-ro.h
   trunk/help/help_mp-sk.h
   trunk/help/help_mp-sv.h
   trunk/help/help_mp-tr.h
   trunk/help/help_mp-uk.h
   trunk/help/help_mp-zh_CN.h
   trunk/help/help_mp-zh_TW.h

Modified: trunk/DOCS/README
==============================================================================
--- trunk/DOCS/README	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/README	Wed May 13 04:58:57 2009	(r29305)
@@ -11,11 +11,11 @@ Thanks for reading MPlayer documentation
    a, Enter the HTML/ directory, and there you'll find the documentation,
       each language in its own subdirectory.
 
-   b, If you prefer reading the documentation as a single big file it 
-      can be found in the HTML-single/ directory, each language in its 
+   b, If you prefer reading the documentation as a single big file it
+      can be found in the HTML-single/ directory, each language in its
       own subdirectory.
 
-   c, If the HTML/ or HTML-single/ directories don't contain your language, 
+   c, If the HTML/ or HTML-single/ directories don't contain your language,
       try the subdirectories in this very same folder.
 
 

Modified: trunk/DOCS/tech/Doxyfile
==============================================================================
--- trunk/DOCS/tech/Doxyfile	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/Doxyfile	Wed May 13 04:58:57 2009	(r29305)
@@ -14,190 +14,190 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
 PROJECT_NAME           = MPlayer
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         =
 
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = DOCS/tech/doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 2 levels of 10 sub-directories under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of source 
-# files, where putting all generated files in the same directory would otherwise 
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 2 levels of 10 sub-directories under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of source
+# files, where putting all generated files in the same directory would otherwise
 # cause performance problems for the file system.
 
 CREATE_SUBDIRS         = YES
 
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese, 
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch,
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en
+# (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese,
 # Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
+# This tag can be used to specify the encoding used in the generated output.
+# The encoding is not always determined by the language that is chosen,
+# but also whether or not the output is meant for Windows or non-Windows users.
+# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES
+# forces the Windows encoding (this is the default for the Windows binary),
+# whereas setting the tag to NO uses a Unix-style encoding (the default for
 # all platforms other than Windows).
 
 USE_WINDOWS_ENCODING   = NO
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
 # Set to NO to disable this.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is used 
-# as the annotated text. Otherwise, the brief description is used as-is. If left 
-# blank, the following values are used ("$name" is automatically replaced with the 
-# name of the entity): "The $name class" "The $name widget" "The $name file" 
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is used
+# as the annotated text. Otherwise, the brief description is used as-is. If left
+# blank, the following values are used ("$name" is automatically replaced with the
+# name of the entity): "The $name class" "The $name widget" "The $name file"
 # "is" "provides" "specifies" "contains" "represents" "a" "an" "the"
 
-ABBREVIATE_BRIEF       = 
+ABBREVIATE_BRIEF       =
 
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
 # description.
 
 ALWAYS_DETAILED_SEC    = NO
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited
+# members of a class in the documentation of that class as if those members were
+# ordinary class members. Constructors, destructors and assignment operators of
 # the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        =
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
 # are normally passed to the compiler using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
 # doesn't support long names like on DOS, Mac, or CD-ROM.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like the Qt-style comments (thus requiring an
 # explicit @brief command for a brief description.
 
 JAVADOC_AUTOBRIEF      = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
 # description. Set this tag to YES if you prefer the old behaviour instead.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
 # will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
+# If set to NO, the detailed description appears after the member
 # documentation.
 
 DETAILS_AT_TOP         = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
 # re-implements.
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
 # Doxygen uses this value to replace tabs by spaces in code fragments.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
 # You can put \n's in the value part of an alias to insert newlines.
 
-ALIASES                = 
+ALIASES                =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources
+# only. Doxygen will then generate output that is more tailored for Java.
+# For instance, namespaces will be presented as packages, qualified scopes
 # will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
 # the \nosubgrouping command.
 
 SUBGROUPING            = YES
@@ -206,162 +206,162 @@ SUBGROUPING            = YES
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
 # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
 # will be included in the documentation.
 
 EXTRACT_PRIVATE        = YES
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
 EXTRACT_STATIC         = YES
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
 EXTRACT_LOCAL_CLASSES  = YES
 
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
 # If set to NO (the default) only methods in the interface are included.
 
 EXTRACT_LOCAL_METHODS  = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
 # This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
 # overviews. This option has no effect if EXTRACT_ALL is enabled.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
 # documentation.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
 # function's detailed documentation block.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
 # Set it to YES to include the internal documentation.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
 # users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
 # documentation. If set to YES the scope will be hidden.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
 # of that file.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
 # is inserted in the documentation for inline members.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
 # declaration order.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
 # declaration order.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the 
+# Note: This option applies only to the class list, not to the
 # alphabetical list.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
 # commands in the documentation.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
 # commands in the documentation.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
 # commands in the documentation.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
 # \deprecated commands in the documentation.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional 
+# The ENABLED_SECTIONS tag can be used to enable conditional
 # documentation sections, marked by \if sectionname ... \endif.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
 # command in the documentation regardless of this setting.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
 # list will mention the files that were used to generate the documentation.
 
 SHOW_USED_FILES        = YES
@@ -370,123 +370,123 @@ SHOW_USED_FILES        = YES
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated 
+# The QUIET tag can be used to turn on/off the messages that are generated
 # by doxygen. Possible values are YES and NO. If left blank NO is used.
 
 QUIET                  = NO
 
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
 # NO is used.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
 # automatically be disabled.
 
 WARN_IF_UNDOCUMENTED   = NO
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
 # don't exist or using markup commands wrongly.
 
 WARN_IF_DOC_ERROR      = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
 # warning originated and the warning text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = 
+INPUT                  =
 
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp
 # *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm
 
-FILE_PATTERNS          = 
+FILE_PATTERNS          =
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
 # If left blank NO is used.
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
 EXCLUDE                = DOCS TOOLS
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
 # that are symbolic links (a Unix filesystem feature) are excluded from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
 # certain files from those directories.
 
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
 # the \include command).
 
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
-EXAMPLE_PATTERNS       = 
+EXAMPLE_PATTERNS       =
 
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
 # Possible values are YES and NO. If left blank NO is used.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             =
 
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
 # to standard output.
 
-INPUT_FILTER           = 
+INPUT_FILTER           =
 
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
 
 FILTER_SOURCE_FILES    = NO
@@ -495,38 +495,38 @@ FILTER_SOURCE_FILES    = NO
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = YES
 
-# Setting the INLINE_SOURCES tag to YES will include the body 
+# Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
 INLINE_SOURCES         = YES
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
 # fragments. Normal C and C++ comments will always remain visible.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
-# then for each documented function all documented 
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default) 
-# then for each documented function all documented entities 
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
 # which an include is specified. Set to NO to disable this.
 
 VERBATIM_HEADERS       = YES
@@ -535,133 +535,133 @@ VERBATIM_HEADERS       = YES
 # configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
 # contains a lot of classes, structs, unions or interfaces.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
 # in which this list will be split (can be a number in the range [1..20])
 
 COLS_IN_ALPHA_INDEX    = 2
 
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
 # should be ignored while generating the index headers.
 
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
 # generate HTML output.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `html' will be used as the default path.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
 # doxygen will generate files with .html extension.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
 # standard header.
 
-HTML_HEADER            = 
+HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.
 
-HTML_FOOTER            = 
+HTML_FOOTER            =
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
 # stylesheet in the HTML output directory as well, or it will be erased!
 
-HTML_STYLESHEET        = 
+HTML_STYLESHEET        =
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
 # NO a bullet list will be used.
 
 HTML_ALIGN_MEMBERS     = YES
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compressed HTML help file (.chm)
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
 # written to the html output directory.
 
-CHM_FILE               = 
+CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
 # the HTML help compiler on the generated index.hhp.
 
-HHC_LOCATION           = 
+HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
 # it should be included in the master .chm file (NO).
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
 # normal table of contents (NO) in the .chm file.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
 # to the contents of the HTML help documentation and to the tree view.
 
 TOC_EXPAND             = NO
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
 # the value YES disables it.
 
 DISABLE_INDEX          = NO
 
-# This tag can be used to set the number of enum values (range [1..20]) 
+# This tag can be used to set the number of enum values (range [1..20])
 # that doxygen will group on one line in the generated HTML documentation.
 
 ENUM_VALUES_PER_LINE   = 4
 
 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
 # probably better off using the HTML help feature.
 
 GENERATE_TREEVIEW      = NO
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
 # is shown.
 
 TREEVIEW_WIDTH         = 250
@@ -670,74 +670,74 @@ TREEVIEW_WIDTH         = 250
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `latex' will be used as the default path.
 
 LATEX_OUTPUT           = latex
 
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked. If left blank `latex' will be used as the default command name.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
 # default command name.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
 # executive. If left blank a4wide will be used.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
 # packages that should be included in the LaTeX output.
 
-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
 # standard header. Notice: only use this tag if you know what you are doing!
 
-LATEX_HEADER           = 
+LATEX_HEADER           =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
 # This makes the output suitable for online browsing using a pdf viewer.
 
 PDF_HYPERLINKS         = NO
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
 # higher quality PDF documentation.
 
 USE_PDFLATEX           = NO
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
 # This option is also used when generating formulas in HTML.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
 LATEX_HIDE_INDICES     = NO
@@ -746,68 +746,68 @@ LATEX_HIDE_INDICES     = NO
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `rtf' will be used as the default path.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
 # save some trees in general.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
 # Note: wordpad (write) and others do not support links.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
 # replacements, missing definitions are set to their default value.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document. 
+# Set optional variables used in the generation of an rtf document.
 # Syntax is similar to doxygen's config file.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `man' will be used as the default path.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to 
+# The MAN_EXTENSION tag determines the extension that is added to
 # the generated man pages (default is the subroutine's section .3)
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
 # would be unable to find the correct page. The default is NO.
 
 MAN_LINKS              = NO
@@ -816,33 +816,33 @@ MAN_LINKS              = NO
 # configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
 # the code including all documentation.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
 # put in front of it. If left blank `xml' will be used as the default path.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_SCHEMA             = 
+XML_SCHEMA             =
 
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
 # syntax of the XML files.
 
-XML_DTD                = 
+XML_DTD                =
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
 # enabling this will significantly increase the size of the XML output.
 
 XML_PROGRAMLISTING     = YES
@@ -851,10 +851,10 @@ XML_PROGRAMLISTING     = YES
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
 # and incomplete at the moment.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -863,280 +863,280 @@ GENERATE_AUTOGEN_DEF   = NO
 # configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
 # moment.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
 # to generate PDF and DVI output from the Perl module output.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.  This is useful
+# if you want to understand what is going on.  On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
 # and Perl will parse it just the same.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
 # Makefile don't overwrite each other's variables.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
 # files.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
 # PREDEFINED and EXPAND_AS_PREDEFINED tags.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
 # in the INCLUDE_PATH (see below) will be search if a #include is found.
 
 SEARCH_INCLUDES        = YES
 
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
 # the preprocessor.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
 # be used.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
 # omitted =1 is assumed.
 
-PREDEFINED             = 
+PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
 # Use the PREDEFINED tag if you want to use a different macro definition.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse the
 # parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references   
+# Configuration::additions related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#   TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#   TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
 # does not have to be run to correct the links.
 # Note that each tag file must have a unique name
 # (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen 
+# If a tag file is not located in the directory in which doxygen
 # is run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
 # will be listed.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
 # be listed.
 
 EXTERNAL_GROUPS        = YES
 
-# The PERL_PATH should be the absolute path and name of the perl script 
+# The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of `which perl').
 
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superseded by the HAVE_DOT option below. This is only a fallback. It is 
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or
+# super classes. Setting the tag to NO turns the diagrams off. Note that this
+# option is superseded by the HAVE_DOT option below. This is only a fallback. It is
 # recommended to install and use dot, since it yields more powerful graphs.
 
 CLASS_DIAGRAMS         = NO
 
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
 # or is not a class.
 
 HIDE_UNDOC_RELATIONS   = YES
 
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
 # have no effect if this option is set to NO (the default)
 
 HAVE_DOT               = NO
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
 # the CLASS_DIAGRAMS tag to NO.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
 # class references variables) of the class with other documented classes.
 
 COLLABORATION_GRAPH    = YES
 
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
 
 UML_LOOK               = NO
 
-# If set to YES, the inheritance and collaboration graphs will show the 
+# If set to YES, the inheritance and collaboration graphs will show the
 # relations between templates and their instances.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
 # other documented files.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
 # indirectly include this file.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
+# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will
+# generate a call dependency graph for every global function or class method.
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
 # functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
 # generated by dot. Possible values are png, jpg, or gif
 # If left blank png will be used.
 
 DOT_IMAGE_FORMAT       = png
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found on the path.
 
-DOT_PATH               = 
+DOT_PATH               =
 
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
 # \dotfile command).
 
-DOTFILE_DIRS           = 
+DOTFILE_DIRS           =
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
+# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
 # large images.
 
 MAX_DOT_GRAPH_WIDTH    = 1024
 
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
+# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
+# (in pixels) of the graphs generated by dot. If a graph becomes larger than
+# this value, doxygen will try to truncate the graph, so that it fits within
+# the specified constraint. Beware that most browsers cannot cope with very
 # large images.
 
 MAX_DOT_GRAPH_HEIGHT   = 1024
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes that 
-# lay further from the root node will be omitted. Note that setting this option to 
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
-# note that a graph may be further truncated if the graph's image dimensions are 
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes that
+# lay further from the root node will be omitted. Note that setting this option to
+# 1 or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that a graph may be further truncated if the graph's image dimensions are
+# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).
 # If 0 is used for the depth value (the default), the graph is not depth-constrained.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
 # arrows in the dot generated graphs.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
 # the various graphs.
 
 DOT_CLEANUP            = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
+# Configuration::additions related to the search engine
 #---------------------------------------------------------------------------
 
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# The SEARCHENGINE tag specifies whether or not a search engine should be
 # used. If set to NO the values of all tags below this one will be ignored.
 
 SEARCHENGINE           = NO

Modified: trunk/DOCS/tech/TODO
==============================================================================
--- trunk/DOCS/tech/TODO	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/TODO	Wed May 13 04:58:57 2009	(r29305)
@@ -26,7 +26,7 @@ FOR THE NEXT RELEASE:
 ~~~~~~~~~~~~~~~~~~~~~~
 - fix vo_svga vs. -vf scale - DONE?
 - Re: [MPlayer-cvslog] CVS: main/libvo vo_vesa.c,1.82,1.83
-  This patch makes mplayer unusable in console mode, always leaves the 
+  This patch makes mplayer unusable in console mode, always leaves the
   console in graphic mode.
 - Dec 19: [BUG] mencoder+mp3lame creates desynced AVI (<=22Khz support missing)
 - finish testing /old-incoming/ samples

Modified: trunk/DOCS/tech/codec-devel.txt
==============================================================================
--- trunk/DOCS/tech/codec-devel.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/codec-devel.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -74,7 +74,7 @@ the driver name.
 
 Next, create a new source file which contains the main decoding function
 that MPlayer will call to decode data. Eventually, you may have multiple
-files which comprise your decoder, but let's start simple here. 
+files which comprise your decoder, but let's start simple here.
 For audio codecs, see ad_sample.c skeleton. For video, choose one of the
 existing vd_*.c files which you think is close to your codec in behaviour.
 
@@ -188,7 +188,7 @@ files:
 - Makefile
 - etc/codecs.conf
 - ad.c or vd.c
-Of course, you will need to include your newly-created file(s): 
+Of course, you will need to include your newly-created file(s):
 vd_<name>.c -OR- ad_<name>.c. If you contribute enough decoders, the
 development team may even grant you write privileges to the Subversion
 repository.
@@ -198,7 +198,7 @@ You may think you're finished when you r
 extremely lucky, you will be right. However, it's more likely that people
 will start throwing all kinds of oddball media at your decoder that it
 never counted on. Cheer up; take comfort in knowing that people are
-testing your code and attempting to use it as a real world 
+testing your code and attempting to use it as a real world
 application. Download the problem media that people upload to the MPlayer
 FTP site and get back to work, implementing fixed code that addresses the
 issues. Contribute more patches and encourage people to hammer on your

Modified: trunk/DOCS/tech/dr-methods.txt
==============================================================================
--- trunk/DOCS/tech/dr-methods.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/dr-methods.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -106,7 +106,7 @@ steps of decoding with libmpcodecs:
 3. vd asks libvo (control(VOCTRL_GET_IMAGE)), if it can provide such buffer:
    - if it can -> do direct rendering
    - it it can not -> allocate system ram area with memalign()/malloc()
-   Note: codec may request EXPORT buffer, it means buffer allocation is 
+   Note: codec may request EXPORT buffer, it means buffer allocation is
    done inside the codec, so we cannot do DR :(
 4. codec decodes one frame to the mpi struct (system ram or direct rendering)
 5. if it isn't DR, we call libvo's draw functions to blit image to video ram

Modified: trunk/DOCS/tech/encoding-tips.txt
==============================================================================
--- trunk/DOCS/tech/encoding-tips.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/encoding-tips.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -122,7 +122,7 @@ long, encoded at 25fps (those nasty NTSC
 headaches. Adjust to your needs, of course!). This leaves you with
 a video bitrate of:
 
-                $videosize * 8 
+                $videosize * 8
 $videobitrate = --------------
                 $length * 1000
 
@@ -152,7 +152,7 @@ vbitate and scale. Why? Because both tog
 many bits it may spend on each frame for each bit: and this is
 the 'bpp' value (bits per pixel). It's simply defined as
 
-         $videobitrate * 1000       
+         $videobitrate * 1000
 $bpp = -----------------------
        $width * $height * $fps
 
@@ -260,7 +260,7 @@ majority of quantizers at 4 and above th
 the resolution (you'll definitly see block artefacts).
 
 
-Well... Several people will probably disagree with me on certain 
+Well... Several people will probably disagree with me on certain
 points here, especially when it comes down to hard values (like the
 $bpp categories and the percentage of the quantizers used). But
 the idea is still valid.
@@ -275,13 +275,13 @@ end up with movies that could certainly 
 
 Now please shoot me if you have any complaints ;)
 
--- 
+--
  ==> Ciao, Mosu (Moritz Bunkus)
 
 ===========
 ANOTHER APPROACH: BITS PER BLOCK:
 
->          $videobitrate * 1000       
+>          $videobitrate * 1000
 > $bpp = -----------------------
 >        $width * $height * $fps
 
@@ -341,7 +341,7 @@ scale down again in desesperate need of 
 In my experience, don't try to go below a width of 576 without closely
 watching what's going on.
 
--- 
+--
 Rémi
 
 ===========
@@ -488,18 +488,18 @@ I found myself that  4:3 B&W old movies 
 addition to the 4:3 aspect ratio which  eats lots of bits, those movies are
 typically very "noisy", which doesn't help at all. Anyway :
 
-> After a few tries I am                                                        
-> still a little bit disappointed with the video quality. Since it is a         
-> "dark" movies, there is a lot of black on the pictures, and on the            
-> encoded avi I can see a lot of annoying "mpeg squares". I am using            
-> avifile codec, but the best I think is to give you the command line I         
-> used to encode a preview of the result:                                       
+> After a few tries I am
+> still a little bit disappointed with the video quality. Since it is a
+> "dark" movies, there is a lot of black on the pictures, and on the
+> encoded avi I can see a lot of annoying "mpeg squares". I am using
+> avifile codec, but the best I think is to give you the command line I
+> used to encode a preview of the result:
 
->                                                                               
-> First pass:                                                                   
-> mencoder TITLE01-ANGLE1.VOB -oac copy -ovc lavc -lavcopts                     
-> vcodec=mpeg4:vhq:vpass=1:vbitrate=800:keyint=48 -ofps 23.976 -npp lb          
-> -ss 2:00 -endpos 0:30 -vf scale -zoom -xy 640 -o movie.avi                   
+>
+> First pass:
+> mencoder TITLE01-ANGLE1.VOB -oac copy -ovc lavc -lavcopts
+> vcodec=mpeg4:vhq:vpass=1:vbitrate=800:keyint=48 -ofps 23.976 -npp lb
+> -ss 2:00 -endpos 0:30 -vf scale -zoom -xy 640 -o movie.avi
 
 1) keyint=48 is way too low. The  default value is 250, this is in *frames*
 not seconds. Keyframes are significantly larger than P or B frames, so the
@@ -555,35 +555,35 @@ Be warned that these options are really 
 could be very good or very bad depending on your visualization device
 (computer CRT, TV or TFT screen). Don't push too hard these options.
 
-> Second pass:                                                                  
-> the same with vpass=2                                                         
+> Second pass:
+> the same with vpass=2
 
 7) I've found  that lavc gives better  results when the first  pass is done
 with  "vqscale=2" instead  of a  target bitrate.  The statistics  collected
 seems to be more precise. YMMV.
 
-> I am new to mencoder, so please tell me any idea you have even if it          
-> obvious. I also tried the "gray" option of lavc, to encode B&W only,          
-> but strangely it gives me "pink" squares from time to time.                   
+> I am new to mencoder, so please tell me any idea you have even if it
+> obvious. I also tried the "gray" option of lavc, to encode B&W only,
+> but strangely it gives me "pink" squares from time to time.
 
 Yes, I've seen  that too. Playing the resulting file  with "-lavdopts gray"
 fix the problem but it's not very nice ...
 
-> So if you could tell me what option of mencoder or lavc I should be           
-> looking at to lower the number of "squares" on the image, it would be         
-> great. The version of mencoder i use is 0.90pre8 on a macos x PPC             
-> platform. I guess I would have the same problem by encoding anime             
-> movies, where there are a lot of region of the image with the same            
-> color. So if you managed to solve this problem...                             
+> So if you could tell me what option of mencoder or lavc I should be
+> looking at to lower the number of "squares" on the image, it would be
+> great. The version of mencoder i use is 0.90pre8 on a macos x PPC
+> platform. I guess I would have the same problem by encoding anime
+> movies, where there are a lot of region of the image with the same
+> color. So if you managed to solve this problem...
 
 You could  also try the  "mpeg_quant" flag. It  selects a different  set of
 quantizers and produce  somewhat sharper pictures and less  blocks on large
 zones with the same or similar luminance, at the expense of some bits.
 
-> This is completely off topic, but do you know how I can create good           
-> subtitles from vobsub subtitles ? I checked the -dumpmpsub option of          
-> mplayer, but is there a way to do it really fast (ie without having to        
-> play the whole movie) ?                                                       
+> This is completely off topic, but do you know how I can create good
+> subtitles from vobsub subtitles ? I checked the -dumpmpsub option of
+> mplayer, but is there a way to do it really fast (ie without having to
+> play the whole movie) ?
 
 I didn't  find a way under  *nix to produce reasonably  good text subtitles
 from vobsubs. OCR  *nix softwares seems either not suited  to the task, not
@@ -601,14 +601,14 @@ for f in 0 1 2 3 4 5 6 7 8 9 10 11 ; do 
 done
 
 (and yes, I've a DVD with 12 subtitles)
---                                                                              
+--
 Rémi
 
 
 ================================================================================
 
 
-TIPS FOR SMOKE & CLOUDS 
+TIPS FOR SMOKE & CLOUDS
 
 Q: I'm trying  to encode Dante's Peak and I'm  having problems with clouds,
 fog and  smoke: They don't  look fine  (they look very  bad if I  watch the
@@ -620,10 +620,10 @@ In particular I'm using vqscale=2:vhq:v4
 
 A: Try adding "vqcomp=0.7:vqblur=0.2:mpeg_quant" to lavcopts.
 
-Q: I tried your suggestion and it  improved the image a little ... but not 
-enough. I was playing with different  options and I couldn't find the way. 
-I  suppose that  the vob  is not  so good  (watching it  in TV  trough the 
-computer looks better than my encoding, but it isn't a lot of better).     
+Q: I tried your suggestion and it  improved the image a little ... but not
+enough. I was playing with different  options and I couldn't find the way.
+I  suppose that  the vob  is not  so good  (watching it  in TV  trough the
+computer looks better than my encoding, but it isn't a lot of better).
 
 A: Yes, those scenes with qscale=2 looks terrible :-(
 
@@ -652,46 +652,46 @@ A = Rémi
 
 TIPS FOR TWEAKING RATECONTROL
 
-(For the purpose of this explanation, consider "2nd pass" to be any beyond 
-the 1st. The algorithm is run only on P-frames; I- and B-frames use QPs 
-based on the adjacent P. While x264's 2pass ratecontrol is based on lavc's, 
+(For the purpose of this explanation, consider "2nd pass" to be any beyond
+the 1st. The algorithm is run only on P-frames; I- and B-frames use QPs
+based on the adjacent P. While x264's 2pass ratecontrol is based on lavc's,
 it has diverged somewhat and not all of this is valid for x264.)
 
 Consider the default ratecontrol equation in lavc: "tex^qComp".
-At the beginning of the 2nd pass, rc_eq is evaluated for each frame, and 
-the result is the number of bits allocated to that frame (multiplied by 
+At the beginning of the 2nd pass, rc_eq is evaluated for each frame, and
+the result is the number of bits allocated to that frame (multiplied by
 some constant as needed to match the total requested bitrate).
 
-"tex" is the complexity of a frame, i.e. the estimated number of bits it 
-would take to encode at a given quantizer. (If the 1st pass was CQP and 
-not turbo, then we know tex exactly. Otherwise it is calculated by 
-multiplying the 1st pass's bits by the QP of that frame. But that's not 
+"tex" is the complexity of a frame, i.e. the estimated number of bits it
+would take to encode at a given quantizer. (If the 1st pass was CQP and
+not turbo, then we know tex exactly. Otherwise it is calculated by
+multiplying the 1st pass's bits by the QP of that frame. But that's not
 why CQP is potentially good; more on that later.)
-"qComp" is just a constant. It has no effect outside the rc_eq, and is 
+"qComp" is just a constant. It has no effect outside the rc_eq, and is
 directly set by the vqcomp parameter.
 
-If vqcomp=1, then rc_eq=tex^1=tex, so 2pass allocates to each frame the 
+If vqcomp=1, then rc_eq=tex^1=tex, so 2pass allocates to each frame the
 number of bits needed to encode them all at the same QP.
-If vqcomp=0, then rc_eq=tex^0=1, so 2pass allocates the same number of 
-bits to each frame, i.e. CBR. (Actually, this is worse than 1pass CBR in 
-terms of quality; CBR can vary within its allowed buffer size, while 
+If vqcomp=0, then rc_eq=tex^0=1, so 2pass allocates the same number of
+bits to each frame, i.e. CBR. (Actually, this is worse than 1pass CBR in
+terms of quality; CBR can vary within its allowed buffer size, while
 vqcomp=0 tries to make each frame exactly the same size.)
-If vqcomp=0.5, then rc_eq=sqrt(tex), so the allocation is somewhere 
-between CBR and CQP. High complexity frames get somewhat lower quality 
+If vqcomp=0.5, then rc_eq=sqrt(tex), so the allocation is somewhere
+between CBR and CQP. High complexity frames get somewhat lower quality
 than low complexity, but still more bits.
 
-While the actual selection of a good value of vqcomp is experimental, the 
+While the actual selection of a good value of vqcomp is experimental, the
 following underlying factors determine the result:
-Arguing towards CQP: You want the movie to be somewhere approaching 
-constant quality; oscillating quality is even more annoying than constant 
-low quality. (However, constant quality does not mean constant PSNR nor 
-constant QP. Details are less noticeable in high-motion scenes, so you can 
-get away with somewhat higher QP in high-complexity frames for the same 
+Arguing towards CQP: You want the movie to be somewhere approaching
+constant quality; oscillating quality is even more annoying than constant
+low quality. (However, constant quality does not mean constant PSNR nor
+constant QP. Details are less noticeable in high-motion scenes, so you can
+get away with somewhat higher QP in high-complexity frames for the same
 perceived quality.)
-Arguing towards CBR: You get more quality per bit if you spend those bits 
-in frames where motion compensation works well (which tends to be 
-correlated with "tex"): A given artifact may stick around several seconds 
-in a low-motion scene, and you only have to fix it in one frame to improve 
+Arguing towards CBR: You get more quality per bit if you spend those bits
+in frames where motion compensation works well (which tends to be
+correlated with "tex"): A given artifact may stick around several seconds
+in a low-motion scene, and you only have to fix it in one frame to improve
 the quality of the whole sequence.
 
 Now for why the 1st pass ratecontrol method matters:

Modified: trunk/DOCS/tech/formats.txt
==============================================================================
--- trunk/DOCS/tech/formats.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/formats.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -19,17 +19,17 @@
     It accepts all PES variants, including files created by VDR.
     Note: VOB (video object) is simple mpeg stream, but it usually has 01BD
     packets which may contain subtitles and non-mpeg audio. Usually found on DVD discs.
-    
+
     Headers: mpeg streams has no global header. each frame sequence (also called GOP,
     group of pictures) contains an sequence header, it describes that block.
     In normal mpeg 1/2 content there are groups of 12-15 frames (24/30 fps).
     It means you can freely seek in mpeg streams, and even can cut it to
     small parts with standard file tools (dd, cut) without destroying it.
-    
+
     Codecs: video is always mpeg video (mpeg1, mpeg2 or mpeg4).
     audio is usually mpeg audio (any layer allowed, but it's layer 2 in most files)
     but 01BD packets may contain AC3, DTS or LPCM too.
-    
+
     FPS: mpeg2 content allows variable framerate, in form of delayed frames.
     It's mostly used for playback 24fps content at 29.97/30 fps (NTSC) rate.
     (so called Telecine or 3:2 pulldown effect)
@@ -77,7 +77,7 @@
     as VBR is unusual, and Microsoft's AVI specs only describe CBR audio.
     I also note, that most AVI encoders/multiplexers create bad files if
     using VBR audio. only 2 exception (known by me): NaNDub and MEncoder.
-    
+
     FPS: only constant framerate allowed, but it's possible to skip frames.
 
   - ASF streams:
@@ -94,7 +94,7 @@
     but all files i've seen had it at the beginning of the file.
     Asf uses fixed packet size, so it is seekable without any INDEX block,
     and broken files are playable well.
-    
+
     Codecs: video is mostly microsoft's mpeg4 variants: MP42, MP43 (aka DivX),
             WMV1 and WMV2. but any codecs allowed.
             audio is usually wma or voxware, sometimes mp3, but any codecs allowed.
@@ -106,16 +106,16 @@
     They come from Mac users, usually with .mov or .qt extension, but as
     MPEG Group chose quicktime as recommended file format for MPEG4,
     sometimes you meet quicktime files with .mpg or .mp4 extension.
-  
+
     At first look, it's a mixture of ASF and AVI.
     It requires INDEX block for random access and seeking, and even for
     playback, like AVI, but uses timestamps instead of constant framerate
     and has more flexible stream options (including network stuff) like ASF.
-    
+
     Headers: header can be placed at the beginning or at the end of file.
     About half of my files have it at the beginning, others have it at the end.
     Broken files are only playable if they have header at the beginning!
-    
+
     Codecs: any codecs allowed, both CBR and VBR.
     Note: most new mov files use Sorenson video and QDesign Music audio,
     they are patented, closed, secret, (TM)-ed etc formats, only Apple's
@@ -128,7 +128,7 @@
     files even has no keyframes, so forget seeking!
     Video is standard h.263 (in vivo/2.0 files it's modified, non-standard
     h.263), audio is either standard g.723 or Vivo Siren codec.
-    
+
     Note, that microsoft licensed vivo stuff, and included in their netshow
     v2.0 program, so there are VfW/ACM codecs for vivo video and audio.
 
@@ -142,14 +142,14 @@
     appended fragments of the video frame. RV30+ supports B frames, so
     you have to parse some bits of the first fragment to get the real PTS.
     The audio frames are fixed size (CBR) but using the same scrambling
-    (out-of-order interleaving) as in the ASF files. 
-    
+    (out-of-order interleaving) as in the ASF files.
+
     Codecs: Audio is either COOK(er), SIPR(o), ATRAC3 or DNET.
     The DNET is actually a byte-swapped low-bitrate Dolby AC3 variant :)
     Video is RV10 (h263 variant), RV20 (rp G2), RV30 (rp v8) or RV40 (rp v9).
-    
+
     FPS: variable, just like in ASF.
-    
+
     Note, that similarity of real and asf has some background - they worked
     together on the (never finished/used) ASF v2 spec for some time.
 

Modified: trunk/DOCS/tech/general.txt
==============================================================================
--- trunk/DOCS/tech/general.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/general.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -148,7 +148,7 @@ Now, go on:
 	 From this we can calculate what PTS we need for the just played
 	 audio, then after we compare this with the video's PTS, we have
 	 the difference!
-	 
+
 	 Life didn't get simpler with AVI. There's the "official" timing
 	 method, the BPS-based, so the header contains how many compressed
 	 audio bytes or chunks belong to one second of frames.
@@ -194,14 +194,14 @@ Now, go on:
 	   blocking. Unfortunately it doesn't say how much we could :((
 	   Also, doesn't/badly works with some drivers.
 	   Only used if none of the above works.
-	 
+
 4. Codecs. Consists of libmpcodecs/* and separate files or libs,
    for example liba52, libmpeg2, xa/*, alaw.c, opendivx/*, loader, mp3lib.
 
    mplayer.c doesn't call them directly, but through the dec_audio.c and
    dec_video.c files, so the mplayer.c doesn't have to know anything about
    the codecs.
-   
+
    libmpcodecs contains wrapper for every codecs, some of them include the
    codec function implementation, some calls functions from other files
    included with mplayer, some calls optional external libraries.

Modified: trunk/DOCS/tech/hwac3.txt
==============================================================================
--- trunk/DOCS/tech/hwac3.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/hwac3.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -61,83 +61,83 @@ running for me.
 -----------------------------------------------------------------------
 Hi there.
 
-Perhaps I can clear up some mystification about AC3 passthrough in 
+Perhaps I can clear up some mystification about AC3 passthrough in
 general and mplayer in special:
 
-To get the external decoder solution working, it must be fed with data 
-which is bitidentical to the chunks in the source ac3 file (compressed 
-data is very picky about bit errors). Additionally - or better to say 
-'historically' - the non-audio bit should be set in the spdif status 
-fields to prevent old spdif hardware from reproducing ugly scratchy 
-noise. Note: for current decoders (probably those with DTS capability) 
-this safety bit isn't needed anymore. At least I can state that for my 
-Sherwood RVD-6095RDS. I think it is due to DTS because DTS sound can 
-reside on a ordinary AudioCD and an ordinary AudioCD-Player will always 
+To get the external decoder solution working, it must be fed with data
+which is bitidentical to the chunks in the source ac3 file (compressed
+data is very picky about bit errors). Additionally - or better to say
+'historically' - the non-audio bit should be set in the spdif status
+fields to prevent old spdif hardware from reproducing ugly scratchy
+noise. Note: for current decoders (probably those with DTS capability)
+this safety bit isn't needed anymore. At least I can state that for my
+Sherwood RVD-6095RDS. I think it is due to DTS because DTS sound can
+reside on a ordinary AudioCD and an ordinary AudioCD-Player will always
 have it's audio-bit set.
 
-The sample format of the data must be 2channel 16bit (little endian 
-IIRC). Samplerates are 48kHz - although my receiver also accepts 
-44100Hz. I do not know if this is due to an over-compatability of my 
-receiver or if 44100 is also possible in the ac3 specs. For safety's 
-sake lets keep this at 48000Hz. AC3 data chunks are inserted into the 
-stream every 0x1600 bytes (don't bite me on that, look into 
+The sample format of the data must be 2channel 16bit (little endian
+IIRC). Samplerates are 48kHz - although my receiver also accepts
+44100Hz. I do not know if this is due to an over-compatability of my
+receiver or if 44100 is also possible in the ac3 specs. For safety's
+sake lets keep this at 48000Hz. AC3 data chunks are inserted into the
+stream every 0x1600 bytes (don't bite me on that, look into
 'ac3-iec958.c': 'ac3_iec958_build_burst').
 
-To come back to the problem: data must be played bit-identically through 
-the soundcard at the correct samplerate and should optionally have it's 
+To come back to the problem: data must be played bit-identically through
+the soundcard at the correct samplerate and should optionally have it's
 non-audio bit set. There are two ways to accomplish this:
 
-1) Some OSS guy invented the format AFMT_AC3. Soundcard drivers 
-implementing this format should therefore adjust it's mixers and 
-switches to produce the desired output. Unfortunately some soundcard 
-drivers do not support this format correctly and most do not even 
+1) Some OSS guy invented the format AFMT_AC3. Soundcard drivers
+implementing this format should therefore adjust it's mixers and
+switches to produce the desired output. Unfortunately some soundcard
+drivers do not support this format correctly and most do not even
 support it at all (including ALSA).
 
-2) The alternative approach currently in mplayer CVS is to simply set 
-the output format to 48kHz16bitLE and rely on the user to have the 
+2) The alternative approach currently in mplayer CVS is to simply set
+the output format to 48kHz16bitLE and rely on the user to have the
 soundcard mixers adjusted properly.
 
-I do have two soundcards with digital IO facilities (CMI8738 and 
-Trident4DWaveNX based) plus the mentioned decoder. I'm currently running 
+I do have two soundcards with digital IO facilities (CMI8738 and
+Trident4DWaveNX based) plus the mentioned decoder. I'm currently running
 Linux-2.4.17. Following configurations are happily running here:
 
 1. Trident with ALSA drivers (OSS does not support Hoontech's dig. IO)
 2. CMI with ALSA drivers
 3. CMI with OSS drivers
 
-For Linux I'd suggest using ALSA because of it's cleaner architecture 
-and more consitent user interface. Not to mention that it'll be the 
+For Linux I'd suggest using ALSA because of it's cleaner architecture
+and more consitent user interface. Not to mention that it'll be the
 standard sound support in Linux soon.
 
-For those who want to stick to OSS drivers: The CMI8738 drivers works 
+For those who want to stick to OSS drivers: The CMI8738 drivers works
 out-of-the-box, if the PCM/Wave mixer is set to 100%.
 
-For ALSA I'd suggest using its OSS emulation. More on that later. 
-ALSA-0.9 invented the idea of cards, devices and dubdevices. You can 
-reach the digital interface of all supported cards consitently by using 
-the device 'hw:x,2' (x counting from 0 is the number of your soundcard). 
-So most people would end up at 'hw:0,2'. This device can only be opened 
-in sample formats and rates which are directly supported in hardware 
-hence no samplerate conversion is done keeping the stream as-is. However 
-most consumer soundcards do not support 44kHz so it would definitively 
-be a bad idea to use this as your standard device if you wanted to 
-listen to some mp3s (most of them are 44kHz due to CD source). Here the 
-OSS comes to play again. You can configure which OSS device (/dev/dsp 
-and /dev/adsp) uses which ALSA device. So I'd suggest pointing the 
-standard '/dev/dsp' to standard 'hw:0,0' which suports mixing and 
-samplerate conversion. No further reconfiguration would be needed for 
-your sound apps. For movies I'd point '/dev/adsp' to 'hw:0,2' and 
-configure mplayer to use adsp instead of dsp. The samplerate constrain 
-is no big deal here since movies usually are in 48Khz anyway. The 
+For ALSA I'd suggest using its OSS emulation. More on that later.
+ALSA-0.9 invented the idea of cards, devices and dubdevices. You can
+reach the digital interface of all supported cards consitently by using
+the device 'hw:x,2' (x counting from 0 is the number of your soundcard).
+So most people would end up at 'hw:0,2'. This device can only be opened
+in sample formats and rates which are directly supported in hardware
+hence no samplerate conversion is done keeping the stream as-is. However
+most consumer soundcards do not support 44kHz so it would definitively
+be a bad idea to use this as your standard device if you wanted to
+listen to some mp3s (most of them are 44kHz due to CD source). Here the
+OSS comes to play again. You can configure which OSS device (/dev/dsp
+and /dev/adsp) uses which ALSA device. So I'd suggest pointing the
+standard '/dev/dsp' to standard 'hw:0,0' which suports mixing and
+samplerate conversion. No further reconfiguration would be needed for
+your sound apps. For movies I'd point '/dev/adsp' to 'hw:0,2' and
+configure mplayer to use adsp instead of dsp. The samplerate constrain
+is no big deal here since movies usually are in 48Khz anyway. The
 configuration in '/etc/modules.conf' is no big deal also:
 
 alias snd-card-0 snd-card-cmipci	# insert your card here
 alias snd-card-1 snd-pcm-oss		# load OSS emulation
 options snd-pcm-oss snd_dsp_map=0 snd_adsp_map=2	# do the mapping
 
-This works flawlessly in combination with alsa's native 
-SysVrc-init-script 'alsasound'. Be sure to disable any distribution 
-dependent script (e.g. Mandrake-8.1 has an 'alsa' script which depends 
+This works flawlessly in combination with alsa's native
+SysVrc-init-script 'alsasound'. Be sure to disable any distribution
+dependent script (e.g. Mandrake-8.1 has an 'alsa' script which depends
 on ALSA-0.5).
 
 Sorry for you *BSD'lers out there. I have no grasp on sound support there.

Modified: trunk/DOCS/tech/libao2.txt
==============================================================================
--- trunk/DOCS/tech/libao2.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/libao2.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -41,7 +41,7 @@ static int play(void* data,int len,int f
   rounded down to 0 or the data will never be played (as MPlayer will never
   call play() with a larger len).
 
-static float get_delay(void); 
+static float get_delay(void);
   Returns how long time it will take to play the data currently in the
   output buffer. Be exact, if possible, since the whole timing depends
   on this! In the worst case, return the maximum delay.
@@ -53,4 +53,4 @@ static void audio_pause(void);
   Pause playing but do not delete buffered data if possible.
 
 static void audio_resume(void);
-  Continue playing after audio_pause().  
+  Continue playing after audio_pause().

Modified: trunk/DOCS/tech/libvo.txt
==============================================================================
--- trunk/DOCS/tech/libvo.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/libvo.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -106,7 +106,7 @@ Each vo driver _has_ to implement these:
 		that sets vo_dx, vo_dy etc. appropriately before config()
 		is called.
 
-    config():	
+    config():
       Set up the video system. You get the dimensions and flags.
       width, height: size of the source image
       d_width, d_height: wanted scaled/display size (it's a hint)
@@ -116,7 +116,7 @@ Each vo driver _has_ to implement these:
 	0x04	- allow software scaling (-zoom)
 	0x08	- flipping (-flip)
       They're defined as VOFLAG_* (see libvo/video_out.h)
-      
+
       IMPORTANT NOTE: config() may be called 0 (zero), 1 or more (2,3...)
       times between preinit() and uninit() calls. You MUST handle it, and
       you shouldn't crash at second config() call or at uninit() without
@@ -158,7 +158,7 @@ Each vo driver _has_ to implement these:
 	 this filter automatically.
 	 Make sure you set VFCAP_OSD depending on whether you implemented it
 	 or not.
-	 
+
 	 NOTE: This one will be obsolete soon! But it's still useful when
 	 you want to do tricks, like rendering osd _after_ hardware scaling
 	 (tdfxfb) or render subtitles under of the image (vo_mpegpes, sdl)

Modified: trunk/DOCS/tech/mingw-crosscompile.txt
==============================================================================
--- trunk/DOCS/tech/mingw-crosscompile.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/mingw-crosscompile.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -11,7 +11,7 @@ http://natsuki.mplayerhq.hu/~reimar/mpl_
 NOTE that this is likely to be quite out-dated and might include packages
 with security issues, so do not use it to build binaries for real use.
 
-After extracting this package into the MPlayer source-tree, 
+After extracting this package into the MPlayer source-tree,
 you only need to run the included linux-mingw.sh to configure (it just runs
 ./configure --host-cc=cc --target=i686-mingw32msvc --cc=i586-mingw32msvc-cc
 --windres=i586-mingw32msvc-windres --ranlib=i586-mingw32msvc-ranlib

Modified: trunk/DOCS/tech/new_policy_proposal.txt
==============================================================================
--- trunk/DOCS/tech/new_policy_proposal.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/new_policy_proposal.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -90,7 +90,7 @@ Reverting broken commits
   If you are even just slightly uncertain how to revert something then ask on
   the mplayer-dev-eng mailing list.
 
-Broken code 
+Broken code
    You must not commit code which breaks MPlayer! (Meaning unfinished but
    enabled code which breaks compilation or compiles but does not work.)
    You can commit unfinished stuff (for testing etc), but it must be disabled
@@ -256,7 +256,7 @@ public developer mailing list and rate o
 unrated options shall be counted equal to the default option
 Any leader can cast a veto against any option except the default up to 10 days
 days after a vote has been started, to do so she has to reply to the original
-vote mail on the public developer mailing list and replace 
+vote mail on the public developer mailing list and replace
 [VOTE] by [VOTE-VETO]
 Developers and leaders who use gpg/pgp MUST sign their votes and vetoes
 
@@ -287,7 +287,7 @@ furthermore B wins even though 100 of 10
 
 S. Changes to developer and Leader status
 ----------------------------------------
-The majority of leaders, that is yes>no can give and take away 
+The majority of leaders, that is yes>no can give and take away
 developer and leader status to people
 furthermore any developer or leader can step back and thus loose
 his leader and or developer status

Modified: trunk/DOCS/tech/playtree
==============================================================================
--- trunk/DOCS/tech/playtree	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/playtree	Wed May 13 04:58:57 2009	(r29305)
@@ -1,5 +1,5 @@
 
-How work the playtree ? 
+How work the playtree ?
 
 Good question, I try to explain but note that it's the first doc
 I write :)
@@ -25,7 +25,7 @@ struct play_tree {
 
 The play_tree_t* hold the links in the 4 directions, the params hold
 all parameters of this entry, loop is obvious (loop < 0 mean infint loop),
-files hold all the files of this entry and entry_type obviously tell the 
+files hold all the files of this entry and entry_type obviously tell the
 type of this entry (Node, file, dvd, vcd ot tv).
 
 An entry can hold more than one file, why ?
@@ -47,7 +47,7 @@ be raised).
 Then to create a list of entry you should use play_tree_append_entry,
 play_tree_prepend_entry or play_tree_insert_entry.
 In all this function you can use any entry of the the list as first argument,
-no need that it's the first one. The same apply when you set the child of a node, 
+no need that it's the first one. The same apply when you set the child of a node,
 the child argument can be any entry in a list.
 To remove an entry from the tree use play_tree_remove. If the second arg (free_it)
 is true it will also free it, if the entry should be freed and the third
@@ -103,7 +103,7 @@ iter->num_files and which one it returne
 In case the entry is a DVD, VCD or TV channel the returned string is not a filename
 but "DVD title x", "VCD track x" or "TV channel x".
 To distinc those case from a normal file you can check iter->tree->entry_type.
-It will contain one of PLAY_TREE_ENTRY_DVD, PLAY_TREE_ENTRY_VCD, 
+It will contain one of PLAY_TREE_ENTRY_DVD, PLAY_TREE_ENTRY_VCD,
 PLAY_TREE_ENTRY_TV or PLAY_TREE_ENTRY_FILE.
 
 If you need to make some check with the iter, such as will next entry be valid, etc

Modified: trunk/DOCS/tech/realcodecs/TODO
==============================================================================
--- trunk/DOCS/tech/realcodecs/TODO	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/realcodecs/TODO	Wed May 13 04:58:57 2009	(r29305)
@@ -20,5 +20,5 @@ TODO:
   also statistics->streams->video->POST FILTER: ON
   (i've found that custommessage calls differ wiht pp on/off, but adding
   these calls to mplayer didn't make a pixel difference between outputs)
-  
+
 

Modified: trunk/DOCS/tech/realcodecs/audio-codecs.txt
==============================================================================
--- trunk/DOCS/tech/realcodecs/audio-codecs.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/realcodecs/audio-codecs.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -65,7 +65,7 @@ void *GetRAFlavorProperty(ra_main_t *raM
 returns property data for a specific data
 
 This is not important, because it's just a read only function.
-These flavor properties don't seem to exist in 
+These flavor properties don't seem to exist in
 
 
 ulong RADecode(ra_main_t *raMain, char *input_buffer,
@@ -91,7 +91,7 @@ audio data storage:
 With Real Audio V5 (or earlier?), the audio streams can be interleaved,
 i.e. the stream is striped amongst several data packets. The packets
 (which have a fixed size packet_len) are split up into a fixed number
-of num_parts equally sized parts - I call them leaves in lack of 
+of num_parts equally sized parts - I call them leaves in lack of
 better name. The leaves have the size leaf_size = packet_len / num_parts.
 
 To create a bunch of packets, you need 2*num_parts stream packets.

Modified: trunk/DOCS/tech/realcodecs/video-codecs.txt
==============================================================================
--- trunk/DOCS/tech/realcodecs/video-codecs.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/realcodecs/video-codecs.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -94,7 +94,7 @@ NOTE:
 rv30 only requires the (0x24,2|3,{w,h,w,h}) message. others can be left out!
 rv20 only requires the (0x11,2,0) message in rp8, before each transform call.
 
-(3,2,0) 
+(3,2,0)
 returns always(?) an error, since a global variable inside the codec
 (which points to a function similar to custommessage), is always NULL
 
@@ -140,7 +140,7 @@ unscaled video stream, the second possib
 060	height	width	height	0
 070	0	1	0	0
 080	0	0xb	w	h
-090	w	h	0	0	
+090	w	h	0	0
 0A0	1	0xb0(w?)	0x58	0x58
 0B0	ptr->?	0	0	1
 0C0	0x32	1	0	0
@@ -148,7 +148,7 @@ unscaled video stream, the second possib
 0E0	0	0	0	0
 0F0	0	0	0	0
 100	0	0	0	0
-110	p	p	p	p p are pointers to several function, for 
+110	p	p	p	p p are pointers to several function, for
 120	p	p	p	p example to the actual public functions
 130	p	p	p	p (except init, the others are some kind of
 140	p	p	p	p interfaces)

Modified: trunk/DOCS/tech/slave.txt
==============================================================================
--- trunk/DOCS/tech/slave.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/slave.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -237,7 +237,7 @@ radio_step_channel <-1|1>
     'channels' radio parameter was set.
 
 radio_step_freq <value>
-    Tune frequency by the <value> (positive - up, negative - down). 
+    Tune frequency by the <value> (positive - up, negative - down).
 
 seek <value> [type]
     Seek to some place in the movie.
@@ -541,7 +541,7 @@ teletext_page      int       0       799
 teletext_subpage   int       0       64      X   X   X
 teletext_mode      flag      0       1       X   X   X    0 - off, 1 - on
 teletext_format    int       0       3       X   X   X    0 - opaque,
-                                                          1 - transparent, 
+                                                          1 - transparent,
                                                           2 - opaque inverted,
                                                           3 - transp. inv.
 teletext_half_page int       0       2       X   X   X    0 - off, 1 - top half,

Modified: trunk/DOCS/tech/snow.txt
==============================================================================
--- trunk/DOCS/tech/snow.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/snow.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -32,7 +32,7 @@ OPTIONS RECOGNIZED BY SNOW
 
  * cmp, subcmp, mbcmp
    Set the comparison function, default: 0 (SAD).
-   useful values = 0 (SAD), 1 (SSD), 2 (SATD), 
+   useful values = 0 (SAD), 1 (SSD), 2 (SATD),
                    11 (5/3 wavelet), 12 (9/7 wavelet).
    SAD is fastest and lowest quality.
    SSD is the only function that makes correct decisions about intra vs

Modified: trunk/DOCS/tech/subcp.txt
==============================================================================
--- trunk/DOCS/tech/subcp.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/subcp.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -1,7 +1,7 @@
 Ascii Subtitle / Font CODEPAGEs
 ===============================
 
-The subtitle encoding issue seems a bit confusing, so I'll try to 
+The subtitle encoding issue seems a bit confusing, so I'll try to
 summarize it here.
 
 There are 2 approaches:
@@ -10,7 +10,7 @@ There are 2 approaches:
 	subfont --unicode <signle-byte encoding known by iconv> ...
 or
 	subfont --unicode <path to custom encoding file> ...
-	(this custom encoding file could list all iso-8859-* characters to create 
+	(this custom encoding file could list all iso-8859-* characters to create
 single font file for common encodings)
 
 and then run mplayer this way (-subcp and -utf8 expect Unicode font!):
@@ -23,8 +23,8 @@ or
 or
 	subfont <path to custom signle-byte or EUC encoding file> ...
 
-and then run mplayer without any encoding options for signle-byte 
-encodings, or with -unicode option for EUC (and the like) encodings 
+and then run mplayer without any encoding options for signle-byte
+encodings, or with -unicode option for EUC (and the like) encodings
 (which is only partially implemented in mplayer).
 
 AFAIK, CJK encodings: EUC-*, BIG5 and GB2312 work more or less this way:
@@ -34,11 +34,11 @@ AFAIK, CJK encodings: EUC-*, BIG5 and GB
 - other characters are single-byte.
 
 
-I tested charmap2enc script only with /usr/share/i18n/charmaps/EUC-KR.gz 
+I tested charmap2enc script only with /usr/share/i18n/charmaps/EUC-KR.gz
 (on RedHat). It wasn't intended to be perfect.
 
 
--- 
+--
 Artur Zaprzala
 
 

Modified: trunk/DOCS/tech/swscaler_methods.txt
==============================================================================
--- trunk/DOCS/tech/swscaler_methods.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/swscaler_methods.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -28,7 +28,7 @@ blocky (upscale only)
 
 recommendations: (based upon my personal opinion many ppl might disagree ...)
 ---------------------------------------------------------------------
-        
+
 the recommended scalers for upscaling:
 fast_bilinear, point if speed is important
 cubic, spline, lanczos if quality is important
@@ -38,8 +38,8 @@ fast_bilinear, point if speed is importa
 gauss, bilinear if quality is important
 cubic, spline, lanczos if a sharper picture is important
 
-note: when encoding at a limited amount of bits (not constant quantizer) 
-then a slightly blurred input might look better after decoding than a slightly 
+note: when encoding at a limited amount of bits (not constant quantizer)
+then a slightly blurred input might look better after decoding than a slightly
 sharpened one, especially for lower bitrates
 
 sws numbers / names / artifact types
@@ -64,6 +64,6 @@ m mosaic (blocky) (upscale only)
 		short filter		 b
 -sws 10	bicubic spline			r
 
-Notes: 
+Notes:
 	area upscale is identical to bilinear
 

Modified: trunk/DOCS/tech/vidix.txt
==============================================================================
--- trunk/DOCS/tech/vidix.txt	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/tech/vidix.txt	Wed May 13 04:58:57 2009	(r29305)
@@ -1,6 +1,6 @@
 		VIDIX - VIDeo Interface for *niX
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		
+
 This interface was designed and introduced as interface to userspace drivers
 to provide DGA everywhere where it's possible (unline X11).
 I hope that these drivers will be portable same as X11 (not only on *nix).
@@ -12,10 +12,10 @@ What is it:
 - Unlikely linux's drivers it uses mathematics library.
 
 Why it was developed:
-As said Vladimir Dergachev 
+As said Vladimir Dergachev
 (http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/gatos/km/km.rfc.txt):
 "0) Motivation
-    v4l, v4l2 and Xv are all suffering from the same problem: attempt to fit 
+    v4l, v4l2 and Xv are all suffering from the same problem: attempt to fit
     existing multimedia devices into a fixed scheme."
 Well - I tried to implement something similar by motivation.
 
@@ -42,7 +42,7 @@ So any suggestions, reports, criticism a
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    vidix_playback_t.fourcc	- contains fourcc of movie
    vidix_playback_t.capability	- currently contsinas copy of vidix_capability_t.flags
-   vidix_playback_t.blend_factor- currently unused   
+   vidix_playback_t.blend_factor- currently unused
    vidix_playback_t.src		- x,y,w,h fields contain original movie size
 				  (in pixels) x and y often are nulls.
    vidix_playback_t.src.pitch.y   These fields contain source pitches
@@ -61,23 +61,23 @@ So any suggestions, reports, criticism a
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    vidix_playback_t.num_frames  - real # of frames which will be used by driver.
 				  (Should be less or equal to app's num_frames).
-				  
+
    vidix_playback_t.dest.pitch.y   These fields should contain alignment
    vidix_playback_t.dest.pitch.u - for each Y,U,V plane in bytes.
    vidix_playback_t.dest.pitch.v   (For packed fourcc only Y value is used)
-   
+
    vidix_playback_t.frame_size	- Driver should tell to app which size of
 				      source frame (src.w and src.h) should
 				      use APP (according to pitches and offsets)
 
    vidix_playback_t.offsets	- offsets from begin of BES memory for each frame
-   
+
    vidix_playback_t.offset.y	  These field should contain offset
    vidix_playback_t.offset.u	- for each Y,U,V plane within frame.
    vidix_playback_t.offset.v	  (For packed fourcc only Y value is used)
 
    vidix_playback_t.dga_addr	- Address of BES memory.
-   
+
 Also see this picture:
 
 VIDEO MEMORY layout:
@@ -128,8 +128,8 @@ Formula: (For Y plane) copy source to:
 10) APP calls vixPlaybackOff. Driver should deactivate BES on this call.
 11) If vixDestroy is defined APP calls this function before unloading driver
     from memory.
-    
-    
+
+
 What functions are mandatory:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 vixGetVersion

Modified: trunk/DOCS/xml/xsl/ldp-html-chunk.xsl
==============================================================================
--- trunk/DOCS/xml/xsl/ldp-html-chunk.xsl	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/xml/xsl/ldp-html-chunk.xsl	Wed May 13 04:58:57 2009	(r29305)
@@ -19,7 +19,7 @@
 <!-- Imports the common LDP customization layer. -->
 <xsl:import href="ldp-html-common.xsl"/>
 
-<!-- If there was some reason to override 'ldp-html-common.xsl' or to 
+<!-- If there was some reason to override 'ldp-html-common.xsl' or to
      perform any other customizations that affect *only* the generation
      of multiple HTML files, those templates or parameters could be
      entered here. -->

Modified: trunk/DOCS/xml/xsl/ldp-html-common.xsl
==============================================================================
--- trunk/DOCS/xml/xsl/ldp-html-common.xsl	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/xml/xsl/ldp-html-common.xsl	Wed May 13 04:58:57 2009	(r29305)
@@ -53,16 +53,16 @@
 <!-- declare-characteristic preserve-sdata?
      No longer appears necessary as it is a JadeTex issue. -->
 
-<!-- generate-legalnotice-link? 
+<!-- generate-legalnotice-link?
      Not currently supported in Norm's XSL stylesheets. Logged
      at SourceForge as a bug. -->
 
 <!-- Should graphics be used for admonitions (notes, warnings)? 0 or 1 -->
 <xsl:param name="admon.graphics" select="0"/>
 
-<!-- If using admon graphics (1 above), what is path to graphics? 
+<!-- If using admon graphics (1 above), what is path to graphics?
      Should be the path relative to your document and MUST end with
-     a trailing slash.  Also, this parameter needs to be on a 
+     a trailing slash.  Also, this parameter needs to be on a
      single line. -->
 <xsl:param name="admon.graphics.path">images/</xsl:param>
 
@@ -82,7 +82,7 @@
 
 <!-- generate-article-titlepage -->
 
-<!-- Equivalent to chunk-skip-first-element-list - forces TOC on separate page 
+<!-- Equivalent to chunk-skip-first-element-list - forces TOC on separate page
      If 0, first sect is on page for chapter or article -->
 <xsl:param name="chunk.first.sections" select="'1'"/>
 
@@ -97,7 +97,7 @@
 <!-- Filename for the root chunk -->
 <xsl:param name="root.filename" select="'index'"/>
 
-<!-- shade-verbatim 
+<!-- shade-verbatim
      I have created a function below that shades the verbatim sections.
      logic would need to be added to check if this is set.
      Norm has added parameters to his 1.44 stylesheets that support
@@ -126,7 +126,7 @@
 <!-- To what depth (in sections) should the TOC go? -->
 <xsl:param name="toc.section.depth" select="2"/>
 
-<!-- Custom 'emphasis' template to allow 'role="strong"' to 
+<!-- Custom 'emphasis' template to allow 'role="strong"' to
      also produce a bold item. -->
 <xsl:template match="emphasis">
   <xsl:choose>
@@ -140,10 +140,10 @@
 </xsl:template>
 
 <!-- book-titlepage-recto-elements
-     article-titlepage-recto-elements 
-     article-titlepage-recto-mode 
-     article-title 
-     
+     article-titlepage-recto-elements
+     article-titlepage-recto-mode
+     article-title
+
      - Customizing these elements (for instance, to list what is on the
        title page) involves writing a layer for html/titlepage.templates.xml and the
        other files html/titlepage.xsl and html/titlepage.templates.xsl - Norm
@@ -151,7 +151,7 @@
 
 <!-- The remainder of ldp.dsl deals with changing the foreground and
      background colors of verbatim elements although in reading through the
-     DSSSL it doesn't look like it actually changed the foreground colors. 
+     DSSSL it doesn't look like it actually changed the foreground colors.
      The changing of the background shading can be done at two locations
      (one numbered, one not) in the template below. -->
 

Modified: trunk/DOCS/xml/xsl/ldp-html.xsl
==============================================================================
--- trunk/DOCS/xml/xsl/ldp-html.xsl	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/DOCS/xml/xsl/ldp-html.xsl	Wed May 13 04:58:57 2009	(r29305)
@@ -19,7 +19,7 @@
 <!-- Imports the common LDP customization layer. -->
 <xsl:import href="/home/n/xml/xsl/ldp-html-common.xsl"/>
 
-<!-- If there was some reason to override 'ldp-html-common.xsl' or to 
+<!-- If there was some reason to override 'ldp-html-common.xsl' or to
      perform any other customizations that affect *only* the generation
      of a single HTML file, those templates or parameters could be
      entered here. -->

Modified: trunk/TOOLS/aconvert.sh
==============================================================================
--- trunk/TOOLS/aconvert.sh	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/aconvert.sh	Wed May 13 04:58:57 2009	(r29305)
@@ -9,5 +9,5 @@ if [ "$1" = "" ]; then
 fi
 
 options=${3:-"-oac mp3lame"}
- 
+
 mencoder -demuxer rawvideo -rawvideo w=1:h=1 -ovc copy -of rawaudio -endpos `mplayer -identify $1 -frames 0 2>&1 | grep ID_LENGTH | cut -d "=" -f 2` -audiofile $1 -o $2 $options $1

Modified: trunk/TOOLS/bmovl-test.c
==============================================================================
--- trunk/TOOLS/bmovl-test.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/bmovl-test.c	Wed May 13 04:58:57 2009	(r29305)
@@ -15,10 +15,10 @@ blit(int fifo, unsigned char *bitmap, in
 {
 	char str[100];
 	int  nbytes;
-	
+
 	sprintf(str, "RGBA32 %d %d %d %d %d %d\n",
 	        width, height, xpos, ypos, alpha, clear);
-	
+
 	if(DEBUG) printf("Sending %s", str);
 
 	write(fifo, str, strlen(str));
@@ -33,7 +33,7 @@ set_alpha(int fifo, int width, int heigh
 
 	sprintf(str, "ALPHA %d %d %d %d %d\n",
 	        width, height, xpos, ypos, alpha);
-	
+
 	if(DEBUG) printf("Sending %s", str);
 
 	write(fifo, str, strlen(str));
@@ -110,7 +110,7 @@ int main(int argc, char **argv) {
 	for(i=-255; i <= 0; i++)
 		set_alpha(fifo, image->w, image->h,
 		          (width/2)-(image->w/2), (height/2)-(image->h/2), i);
-	
+
 
 	// Clean up
 	free(bitmap);

Modified: trunk/TOOLS/calcbpp.pl
==============================================================================
--- trunk/TOOLS/calcbpp.pl	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/calcbpp.pl	Wed May 13 04:58:57 2009	(r29305)
@@ -4,7 +4,7 @@ use POSIX;
 
 sub round {
   my $v = shift;
-  
+
   return floor($v + 0.5);
 }
 

Modified: trunk/TOOLS/divx2svcd.sh
==============================================================================
--- trunk/TOOLS/divx2svcd.sh	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/divx2svcd.sh	Wed May 13 04:58:57 2009	(r29305)
@@ -315,7 +315,7 @@ if [ "$burning" = 1 ]; then
 cat <<EOF
 
 Please insert a blank cd in your cdwriter.
-(If you are using a rewritable media, 
+(If you are using a rewritable media,
 don't forgot to blank it before using divx2svcd.)
 Press any key when your are ready.
 EOF

Modified: trunk/TOOLS/mencvcd.sh
==============================================================================
--- trunk/TOOLS/mencvcd.sh	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/mencvcd.sh	Wed May 13 04:58:57 2009	(r29305)
@@ -31,7 +31,7 @@ done
 ################################################################################
 #
 # 2002/04/11        v0.1.0: first version
-# 2002/04/12        v0.1.1: 
+# 2002/04/12        v0.1.1:
 # 2002/04/14        v0.1.2:
 #                     - handles now multiple vcd's
 #                     - support's mp3 audio as option
@@ -81,7 +81,7 @@ done
 TMPDIR="." # path to directory for creating temporary files, recommended 2-3GB space
 
 CDDRV="generic-mmc"    # cdrdao: cdwriter driver
-CDDEV="--device 0,1,0" # or comment out and create link /dev/cdrecorder 
+CDDEV="--device 0,1,0" # or comment out and create link /dev/cdrecorder
                        # to your cdwriter dev
 CDMAXSIZE=800
 
@@ -170,7 +170,7 @@ usage() {
 
 HOWCALLED=`basename $0`
 if [ $# -le 1 ]; then
-   usage 
+   usage
    exit 1
 fi
 case $1 in
@@ -359,19 +359,19 @@ if [ $burnonly -eq 0 ]; then
       command="mplayer -noframedrop -vo yuv4mpeg -ao pcm:waveheader -v -osdlevel 0 $sub $params"
       echo "$command"
       $command &
-      
+
       # mjpegtools
       ($denoise < $VIDEO | \
          yuvscaler -v 0 $wide -O $vnorm $size $yuvin | \
          mpeg2enc -v 0 -s $mpegnorm $aratio -S $CDMAXSIZE -g 6 -G 15 -r 16 \
 	          $pd $framerate $yuvin -4 2 -2 1 -o $NAME.mpv) &
-   
+
       # wait for finishing the subprocesses
       wait
 
       # normalize sound
       [ $norm -eq 1 ] && (echo "normalizing sound..."; normalize $AUDIO)
-      
+
       # do resampling with sox
       if [ $sox -ne 0 ]; then
 	echo "wait, do resampling with sox..."
@@ -384,7 +384,7 @@ if [ $burnonly -eq 0 ]; then
 	echo "wait, encoding to mp2 audio with toolame..."
 	toolame -b $abr $AUDIO
 	mv -f `basename $AUDIO .wav`.mp2 $NAME.mpa
-      elif [ $toolame -eq 0 -a $mp3 -eq 0 ]; then 
+      elif [ $toolame -eq 0 -a $mp3 -eq 0 ]; then
         # mp2enc/lame can't read audiodump.wav directly from named pipe,
         # we have to read the whole file.
 	echo "wait, encoding to mp2 audio with mp2enc..."
@@ -405,12 +405,12 @@ if [ $burnonly -eq 0 ]; then
 
    # remove pipe, won't need anymore!
    rm -f $VIDEO
-   
+
    # should i create only the mpeg file?
    [ $mpgonly -eq 1 ] && exit 0
 
    # create cd images
-   for mpg in ${NAME}*.mpg; do 
+   for mpg in ${NAME}*.mpg; do
       [ -f $mpg ] || exit 1
       cue="`basename $mpg .mpg`.cue"
       bin="`basename $mpg .mpg`.bin"

Modified: trunk/TOOLS/modify_reg.c
==============================================================================
--- trunk/TOOLS/modify_reg.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/modify_reg.c	Wed May 13 04:58:57 2009	(r29305)
@@ -105,7 +105,7 @@ int main(int argc, char *argv[]) {
         if (c == EOF)
             break;
         switch(c) {
-          case 'r': 
+          case 'r':
             localregpathname = optarg;
             break;
           case 'l':

Modified: trunk/TOOLS/movinfo.c
==============================================================================
--- trunk/TOOLS/movinfo.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/movinfo.c	Wed May 13 04:58:57 2009	(r29305)
@@ -8,9 +8,9 @@
 
   By older files, mdat is at the beginning, and moov follows it later,
   by newer files, moov is at the begininng.
-  
+
   Fontosabb typeok:
-  
+
   trak: track: ezeken belul van egy-egy stream (video/audio)
   tkhd: track header: fps (video esten picture size is itt van)
   vmhd: video media handler (video stream informaciok)
@@ -113,7 +113,7 @@ static void userdata_info(FILE *f, int l
   {
     atom_size=read_dword(f);//  if(fread(&atom_size_b,4,1,f)<=0) break;
     if(fread(&atom_type,4,1,f)<=0) break;
-  
+
     if(atom_size<8) break; // error
 
 //    printf("%08X:  %*s %.4s (%08X) %05d (begin: %08X)\n",pos,level*2,"",
@@ -124,7 +124,7 @@ static void userdata_info(FILE *f, int l
       case 0x797063A9: /* cpy (copyright) */
         {
 	  char *data = malloc(atom_size-8);
-	  
+
 	  fseek(f, pos+6, SEEK_SET);
 	  fread(data, atom_size-8, 1, f);
 	  printf(" Copyright: %s\n", data);
@@ -134,7 +134,7 @@ static void userdata_info(FILE *f, int l
       case 0x666E69A9: /* inf (information) */
         {
 	  char data[atom_size-8];
-	  
+
 	  fread(&data, 1, atom_size-8, f);
 	  printf(" Owner: %s\n", &data);
 	}
@@ -142,7 +142,7 @@ static void userdata_info(FILE *f, int l
       case 0x6D616EA9: /* nam (name) */
         {
 	  char data[atom_size-8];
-	  
+
 	  fread(&data, 1, atom_size-8, f);
 	  printf(" Name: %s\n", &data);
 	}
@@ -164,9 +164,9 @@ static void lschunks(FILE *f,int level,u
   pos=ftell(f);
   atom_size=read_dword(f);//  if(fread(&atom_size_b,4,1,f)<=0) break;
   if(fread(&atom_type,4,1,f)<=0) break;
-  
+
   if(atom_size<8) break; // error
-  
+
   printf("%08X:  %*s %.4s (%08X) %05d [%s] (begin: %08X)\n",pos,level*2,"",&atom_type,atom_type,atom_size,
     atom2human_type(atom_type), pos+8); // 8: atom_size fields (4) + atom_type fields (4)
 
@@ -177,7 +177,7 @@ static void lschunks(FILE *f,int level,u
   if (atom_type == 0x6468646D)
   {
     char data[4];
-    
+
     fread(&data, 1, 1, f); // char
     printf("mdhd version %d\n", data[0]);
     fread(&data, 3, 1, f); // int24
@@ -196,7 +196,7 @@ static void lschunks(FILE *f,int level,u
     stream = S_VIDEO;
     printf(" Found VIDEO Stream #%d\n", v_stream++);
   }
-  
+
   if (atom_type == 0x64686D73)
   {
     stream = S_AUDIO;
@@ -219,7 +219,7 @@ static void lschunks(FILE *f,int level,u
     if (x == 0 && y == 0)
 	printf(" Possible audio stream!\n");
   }
-  
+
   if(atom_type==0x64737473) {  // stsd
     unsigned int tmp;
     unsigned int count;
@@ -240,7 +240,7 @@ static void lschunks(FILE *f,int level,u
       fseek(f,len-8,SEEK_CUR);
     }
   }
-  
+
   if(atom_type==0x6F637473) {  // stco
     int len,i;
     read_dword(f);
@@ -292,7 +292,7 @@ static void lschunks(FILE *f,int level,u
     }
   }
 #endif
-  
+
 #if 1
   switch(atom_type){
   case 0x7461646D: // mdat  Movie data
@@ -326,7 +326,7 @@ static void lschunks(FILE *f,int level,u
 int main(int argc,char* argv[])
 {
     FILE *f;
-    
+
     if ((f = fopen(argc>1?argv[1]:"Akira.mov","rb")) == NULL)
 	return 1;
 

Modified: trunk/TOOLS/netstream.c
==============================================================================
--- trunk/TOOLS/netstream.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/netstream.c	Wed May 13 04:58:57 2009	(r29305)
@@ -108,7 +108,7 @@ static int net_stream_open(client_t* cl,
 static int net_stream_fill_buffer(client_t* cl,uint16_t max_len) {
   int r;
   mp_net_stream_packet_t *pack;
-  
+
   if(!cl->stream) {
     if(!write_error(cl->fd,"No stream is currently opened\n"))
       return 0;
@@ -132,7 +132,7 @@ static int net_stream_fill_buffer(client
 }
 
 static int net_stream_seek(client_t* cl, uint64_t pos) {
-  
+
   if(!cl->stream) {
     if(!write_error(cl->fd,"No stream is currently opened\n"))
       return 0;
@@ -180,7 +180,7 @@ static int handle_client(client_t* cl,mp
 
   if(!pack)
     return 0;
- 
+
   switch(pack->cmd) {
   case NET_STREAM_OPEN:
     if(((char*)pack)[pack->len-1] != '\0') {
@@ -239,7 +239,7 @@ static int make_fd_set(fd_set* fds, clie
       if(cl->stream) free_stream(cl->stream);
       if(!cl->prev) // Remove the head
 	*_cl = cl->next;
-      cl = cl->next;  
+      cl = cl->next;
       free(f);
       continue;
     }
@@ -276,7 +276,7 @@ static int main_loop(int listen_fd) {
   signal(SIGHUP,exit_sig);  // kill -HUP  /  xterm closed
   signal(SIGINT,exit_sig);  // Interrupt from keyboard
   signal(SIGQUIT,exit_sig); // Quit from keyboard
-#endif 
+#endif
 
   while(run_server) {
     int sel_n = make_fd_set(&fds,&clients,listen_fd);
@@ -338,7 +338,7 @@ int main(void) {
 
   mp_msg_init();
   //  mp_msg_set_level(verbose+MSGL_STATUS);
-  
+
 #ifdef __MINGW32__
   WSADATA wsaData;
   WSAStartup(MAKEWORD(1,1), &wsaData);
@@ -356,7 +356,7 @@ int main(void) {
     mp_msg(MSGT_NETST,MSGL_FATAL,"Failed to bind listen socket: %s\n",strerror(errno));
     return -1;
   }
-  
+
 
   if(listen(listen_fd,1)) {
     mp_msg(MSGT_NETST,MSGL_FATAL,"Failed to turn the socket in listen state: %s\n",strerror(errno));

Modified: trunk/TOOLS/plotpsnr.pl
==============================================================================
--- trunk/TOOLS/plotpsnr.pl	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/plotpsnr.pl	Wed May 13 04:58:57 2009	(r29305)
@@ -216,7 +216,7 @@ sub commandline {
 	"iframes"	=> \$options{iframes},
 	"pframes"	=> \$options{pframes},
 	"bframes"	=> \$options{bframes},
-	"aframes"	=> sub { $options{iframes} = 1; 
+	"aframes"	=> sub { $options{iframes} = 1;
 				 $options{pframes}  = 1;
 				 $options{bframes}  = 1; },
         "qs=s"     	=> \$options{qs},

Modified: trunk/TOOLS/qepdvcd.sh
==============================================================================
--- trunk/TOOLS/qepdvcd.sh	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/qepdvcd.sh	Wed May 13 04:58:57 2009	(r29305)
@@ -3,23 +3,23 @@
 # QEPDVCD
 #
 # Most of this stuff comes straight from MPlayer documentation.
-# Options are limited only to a small useful subset, if you 
+# Options are limited only to a small useful subset, if you
 # want more control, RTFM and DIY.
 #
 # Version:          0.1
 #
 # Licence:          GPL
 #
-# Author:           Reynaldo H. Verdejo Pinochet <reynaldo at opendot.cl> 
+# Author:           Reynaldo H. Verdejo Pinochet <reynaldo at opendot.cl>
 #
-# Script:           MPlayer Sources. Anything supported to vcd/svcd pal/ntsc 
+# Script:           MPlayer Sources. Anything supported to vcd/svcd pal/ntsc
 #
 # requires:         mencoder
 #
-# sugests:          vcdimager / cdrecord 
+# sugests:          vcdimager / cdrecord
 #
 # Thanks to:        Carlos Navarro Salas - name author ;)
-#					
+#
 #
 
 # Defaults
@@ -276,7 +276,7 @@ for j in $(seq 0 $CICLES); do
 			fi
 		done
 	fi
-		
+
 # Mencoder Time ;-) ###################################################
 
 mencoder \

Modified: trunk/TOOLS/realcodecs/14_4.c
==============================================================================
--- trunk/TOOLS/realcodecs/14_4.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/realcodecs/14_4.c	Wed May 13 04:58:57 2009	(r29305)
@@ -137,7 +137,7 @@ void hexdump(void *pos, int len) {
 	int lines=(len+15)>>4;
 	while(lines--) {
 		int len1=len, i;
-		fprintf(stderr, "%0x  ", cpos); 
+		fprintf(stderr, "%0x  ", cpos);
 		cpos1=cpos;
 		for (i=0;i<16;i++) {
 			if (len1>0) {
@@ -157,7 +157,7 @@ void hexdump(void *pos, int len) {
 			}
 			len--;
 		}
-		fputs("\n", stderr);		
+		fputs("\n", stderr);
 	}
 	fputc('\n', stderr);
 }
@@ -177,7 +177,7 @@ static int pkno=0;
 ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) {
 	ulong result;
 	int x,y;
-	
+
 	fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1);
 	fprintf(stderr, "ulong src=0x%0lx,\n", p2);
 	fprintf(stderr, "ulong len=0x%0lx,", p3);
@@ -261,7 +261,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) {
 //	memset(temp2,0x77,256);
 //	memcpy(temp2,temp[6],16);
 //	temp[6]=temp2;
-	
+
 	result=(*raInitDecoder)(p1,/*temp*/p2);
 //	hexdump((void*)temp[6], 32);
 //	memcpy(p2,temp,4*11);
@@ -310,6 +310,6 @@ ulong RASetFlavor(ulong p1) {
 
 	fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr);
 #endif
-	
+
 	return result;
 }

Modified: trunk/TOOLS/realcodecs/28_8.c
==============================================================================
--- trunk/TOOLS/realcodecs/28_8.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/realcodecs/28_8.c	Wed May 13 04:58:57 2009	(r29305)
@@ -137,7 +137,7 @@ void hexdump(void *pos, int len) {
 	int lines=(len+15)>>4;
 	while(lines--) {
 		int len1=len, i;
-		fprintf(stderr, "%0x  ", cpos); 
+		fprintf(stderr, "%0x  ", cpos);
 		cpos1=cpos;
 		for (i=0;i<16;i++) {
 			if (len1>0) {
@@ -157,7 +157,7 @@ void hexdump(void *pos, int len) {
 			}
 			len--;
 		}
-		fputs("\n", stderr);		
+		fputs("\n", stderr);
 	}
 	fputc('\n', stderr);
 }
@@ -177,7 +177,7 @@ static int pkno=0;
 ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) {
 	ulong result;
 	int x,y;
-	
+
 	fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1);
 	fprintf(stderr, "ulong src=0x%0lx,\n", p2);
 	fprintf(stderr, "ulong len=0x%0lx,", p3);
@@ -261,7 +261,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) {
 //	memset(temp2,0x77,256);
 //	memcpy(temp2,temp[6],16);
 //	temp[6]=temp2;
-	
+
 	result=(*raInitDecoder)(p1,/*temp*/p2);
 //	hexdump((void*)temp[6], 32);
 //	memcpy(p2,temp,4*11);
@@ -310,6 +310,6 @@ ulong RASetFlavor(ulong p1) {
 
 	fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr);
 #endif
-	
+
 	return result;
 }

Modified: trunk/TOOLS/realcodecs/cook.c
==============================================================================
--- trunk/TOOLS/realcodecs/cook.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/realcodecs/cook.c	Wed May 13 04:58:57 2009	(r29305)
@@ -184,7 +184,7 @@ void hexdump(void *pos, int len) {
 	int lines=(len+15)>>4;
 	while(lines--) {
 		int len1=len, i;
-		fprintf(stderr, "%0x  ", cpos); 
+		fprintf(stderr, "%0x  ", cpos);
 		cpos1=cpos;
 		for (i=0;i<16;i++) {
 			if (len1>0) {
@@ -204,7 +204,7 @@ void hexdump(void *pos, int len) {
 			}
 			len--;
 		}
-		fputs("\n", stderr);		
+		fputs("\n", stderr);
 	}
 	fputc('\n', stderr);
 }
@@ -224,7 +224,7 @@ static int pkno=0;
 ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) {
 	ulong result;
 	int x,y;
-	
+
 	fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1);
 	fprintf(stderr, "ulong src=0x%0lx,\n", p2);
 	fprintf(stderr, "ulong len=0x%0lx,", p3);
@@ -344,7 +344,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) {
 	memset(temp2,0x77,256);
 	memcpy(temp2,temp[6],16);
 	temp[6]=temp2;
-	
+
 	result=(*raInitDecoder)(p1,temp);
 	hexdump((void*)temp[6], 32);
 //	memcpy(p2,temp,4*11);
@@ -414,7 +414,7 @@ ulong RASetFlavor(ulong p1,ulong p2) {
 
 	fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr);
 #endif
-	
+
 	return result;
 }
 

Modified: trunk/TOOLS/realcodecs/drv2.c
==============================================================================
--- trunk/TOOLS/realcodecs/drv2.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/realcodecs/drv2.c	Wed May 13 04:58:57 2009	(r29305)
@@ -161,7 +161,7 @@ static void hexdump(void *pos, int len) 
 	int lines=(len+15)>>4;
 	while(lines--) {
 		int len1=len, i;
-		fprintf(stderr, "#R# %0x  ", (int)cpos-(int)pos); 
+		fprintf(stderr, "#R# %0x  ", (int)cpos-(int)pos);
 		cpos1=cpos;
 		for (i=0;i<16;i++) {
 			if (len1>0) {
@@ -181,7 +181,7 @@ static void hexdump(void *pos, int len) 
 			}
 			len--;
 		}
-		fputs("\n", stderr);		
+		fputs("\n", stderr);
 	}
 	fputc('\n', stderr);
 }
@@ -195,15 +195,15 @@ ulong RV20toYUV420CustomMessage(ulong* p
 
 /*
 	if(p1[0]!=17) return 0;
-	
+
 	if(p1[1]!=1) return 0;
-	
+
 	if(p1[0]==105) return 0;
 	if(p1[0]==3) return 0;
 	if(p1[0]==18) return 0;
 	if(p1[0]==30) return 0;
 */
-	
+
 	if(p1[0]==0x24){
 #if 1
 	    hexdump(p1[2],64);
@@ -257,9 +257,9 @@ ulong RV20toYUV420HiveMessage(ulong *p1,
 //	hexdump((void*)p1, sizeof(struct init_data));
 
 	fprintf(stderr,">HIVE %ld %p\n",p1[0],p1[1]);
-	
+
 	if(p1[0]!=0) return 0;
-	
+
 	p1[1]=0x10000000;
 	return 0;
 
@@ -267,7 +267,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,
 	memset(h_temp,0x77,1000);
 	memcpy(h_temp,p1,4);
 //	fprintf(stderr,"COPY OK!\n");
-	
+
 //	tic();
 //	result=(*rvyuvHiveMessage)(p1,p2);
 	result=(*rvyuvHiveMessage)(h_temp,p2);
@@ -281,7 +281,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,
 
 //	p1[0]=0;
 //	p1[1]=0x20000000;
-	
+
 	fprintf(stderr,"<HIVE %ld %p\n",p1[0],p1[1]);
 
 //	hexdump((void*)p1, sizeof(struct init_data));
@@ -387,28 +387,28 @@ ulong RV20toYUV420Transform(ulong p1,ulo
 	pch=p1;
 	crc_src=build_crc(pch, pp3[0]);
 
-	pp4=pp3[3];	
+	pp4=pp3[3];
 	fprintf(stderr,"transin1[%p]: {%ld/%ld} ",pp4,pp3[2],pp3[0]);
 //	pp4[0],pp4[1],pp4[2],pp4[3],
 //	pp4[4],pp4[5],pp4[6],pp4[7]);
-	
+
 	memset(temp,0x77,128*4);
-	
+
 	memcpy(temp,pp4,8*(pp3[2]+1));
 	for(i=0;i<=pp3[2];i++){
 	    fprintf(stderr," %p(%ld)",temp[i*2],temp[i*2+1]);
 	}
         fprintf(stderr,"\n");
-	
+
 
 	pp3[3]=pp4=temp;
-	
+
 //	pp4[2]=
 //	pp4[3]=
 //	pp4[4]=NULL;
-	
+
 	//pp4[6]=pp4[5];
-	
+
 	v=p5;
 /*	fprintf(stderr, "rvyuvMain=0x%0x\n", v);
 	v+=0x3c;
@@ -431,7 +431,7 @@ ulong RV20toYUV420Transform(ulong p1,ulo
 		fprintf(stderr, "[$+178h]=0x%0x\n", v);
 		hexdump(v, 128);
 	}
-*/	
+*/
 //	tic();
 	result=(*rvyuvTransform)(p1,p2,p3,p4,p5);
 //	toc();

Modified: trunk/TOOLS/realcodecs/drv3.c
==============================================================================
--- trunk/TOOLS/realcodecs/drv3.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/realcodecs/drv3.c	Wed May 13 04:58:57 2009	(r29305)
@@ -161,7 +161,7 @@ static void hexdump(void *pos, int len) 
 	int lines=(len+15)>>4;
 	while(lines--) {
 		int len1=len, i;
-		fprintf(stderr, "#R# %0x  ", (int)cpos-(int)pos); 
+		fprintf(stderr, "#R# %0x  ", (int)cpos-(int)pos);
 		cpos1=cpos;
 		for (i=0;i<16;i++) {
 			if (len1>0) {
@@ -181,7 +181,7 @@ static void hexdump(void *pos, int len) 
 			}
 			len--;
 		}
-		fputs("\n", stderr);		
+		fputs("\n", stderr);
 	}
 	fputc('\n', stderr);
 }
@@ -242,7 +242,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,
 	memset(h_temp,0x77,1000);
 	memcpy(h_temp,p1,4);
 	fprintf(stderr,"COPY OK!\n");
-	
+
 //	tic();
 //	result=(*rvyuvHiveMessage)(p1,p2);
 	result=(*rvyuvHiveMessage)(h_temp,p2);
@@ -256,7 +256,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,
 
 //	p1[0]=0;
 //	p1[1]=0x20000000;
-	
+
 	fprintf(stderr,"<HIVE %ld %p\n",p1[0],p1[1]);
 
 //	hexdump((void*)p1, sizeof(struct init_data));
@@ -362,28 +362,28 @@ ulong RV20toYUV420Transform(ulong p1,ulo
 	pch=p1;
 	crc_src=build_crc(pch, pp3[0]);
 
-	pp4=pp3[3];	
+	pp4=pp3[3];
 	fprintf(stderr,"transin1[%p]: {%ld/%ld} ",pp4,pp3[2],pp3[0]);
 //	pp4[0],pp4[1],pp4[2],pp4[3],
 //	pp4[4],pp4[5],pp4[6],pp4[7]);
-	
+
 	memset(temp,0x77,128*4);
-	
+
 	memcpy(temp,pp4,8*(pp3[2]+1));
 	for(i=0;i<=pp3[2];i++){
 	    fprintf(stderr," %p(%ld)",temp[i*2],temp[i*2+1]);
 	}
         fprintf(stderr,"\n");
-	
+
 
 	pp3[3]=pp4=temp;
-	
+
 //	pp4[2]=
 //	pp4[3]=
 //	pp4[4]=NULL;
-	
+
 	//pp4[6]=pp4[5];
-	
+
 	v=p5;
 /*	fprintf(stderr, "rvyuvMain=0x%0x\n", v);
 	v+=0x3c;
@@ -406,7 +406,7 @@ ulong RV20toYUV420Transform(ulong p1,ulo
 		fprintf(stderr, "[$+178h]=0x%0x\n", v);
 		hexdump(v, 128);
 	}
-*/	
+*/
 //	tic();
 	result=(*rvyuvTransform)(p1,p2,p3,p4,p5);
 //	toc();

Modified: trunk/TOOLS/realcodecs/drv4.c
==============================================================================
--- trunk/TOOLS/realcodecs/drv4.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/realcodecs/drv4.c	Wed May 13 04:58:57 2009	(r29305)
@@ -133,7 +133,7 @@ static void hexdump(void *pos, int len) 
 	int lines=(len+15)>>4;
 	while(lines--) {
 		int len1=len, i;
-		fprintf(stderr, "#R# %0x  ", (int)cpos-(int)pos); 
+		fprintf(stderr, "#R# %0x  ", (int)cpos-(int)pos);
 		cpos1=cpos;
 		for (i=0;i<16;i++) {
 			if (len1>0) {
@@ -153,7 +153,7 @@ static void hexdump(void *pos, int len) 
 			}
 			len--;
 		}
-		fputs("\n", stderr);		
+		fputs("\n", stderr);
 	}
 	fputc('\n', stderr);
 }
@@ -214,7 +214,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,
 	memset(h_temp,0x77,1000);
 	memcpy(h_temp,p1,4);
 	fprintf(stderr,"COPY OK!\n");
-	
+
 //	tic();
 //	result=(*rvyuvHiveMessage)(p1,p2);
 	result=(*rvyuvHiveMessage)(h_temp,p2);
@@ -228,7 +228,7 @@ ulong RV20toYUV420HiveMessage(ulong *p1,
 
 //	p1[0]=0;
 //	p1[1]=0x20000000;
-	
+
 	fprintf(stderr,"<HIVE %ld %p\n",p1[0],p1[1]);
 
 //	hexdump((void*)p1, sizeof(struct init_data));
@@ -334,28 +334,28 @@ ulong RV20toYUV420Transform(ulong p1,ulo
 	pch=p1;
 	crc_src=build_crc(pch, pp3[0]);
 
-	pp4=pp3[3];	
+	pp4=pp3[3];
 	fprintf(stderr,"transin1[%p]: {%ld/%ld} ",pp4,pp3[2],pp3[0]);
 //	pp4[0],pp4[1],pp4[2],pp4[3],
 //	pp4[4],pp4[5],pp4[6],pp4[7]);
-	
+
 	memset(temp,0x77,128*4);
-	
+
 	memcpy(temp,pp4,8*(pp3[2]+1));
 	for(i=0;i<=pp3[2];i++){
 	    fprintf(stderr," %p(%ld)",temp[i*2],temp[i*2+1]);
 	}
         fprintf(stderr,"\n");
-	
+
 
 	pp3[3]=pp4=temp;
-	
+
 //	pp4[2]=
 //	pp4[3]=
 //	pp4[4]=NULL;
-	
+
 	//pp4[6]=pp4[5];
-	
+
 	v=p5;
 /*	fprintf(stderr, "rvyuvMain=0x%0x\n", v);
 	v+=0x3c;
@@ -378,7 +378,7 @@ ulong RV20toYUV420Transform(ulong p1,ulo
 		fprintf(stderr, "[$+178h]=0x%0x\n", v);
 		hexdump(v, 128);
 	}
-*/	
+*/
 //	tic();
 	result=(*rvyuvTransform)(p1,p2,p3,p4,p5);
 //	toc();

Modified: trunk/TOOLS/realcodecs/ra.c
==============================================================================
--- trunk/TOOLS/realcodecs/ra.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/realcodecs/ra.c	Wed May 13 04:58:57 2009	(r29305)
@@ -183,7 +183,7 @@ void hexdump(void *pos, int len) {
 	int lines=(len+15)>>4;
 	while(lines--) {
 		int len1=len, i;
-		fprintf(stderr, "%0x  ", cpos); 
+		fprintf(stderr, "%0x  ", cpos);
 		cpos1=cpos;
 		for (i=0;i<16;i++) {
 			if (len1>0) {
@@ -203,7 +203,7 @@ void hexdump(void *pos, int len) {
 			}
 			len--;
 		}
-		fputs("\n", stderr);		
+		fputs("\n", stderr);
 	}
 	fputc('\n', stderr);
 }
@@ -380,7 +380,7 @@ ulong RASetFlavor(ulong p1,ulong p2) {
 	}
 
 	fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr);
-*/	
+*/
 	return result;
 }
 

Modified: trunk/TOOLS/realcodecs/rv30.c
==============================================================================
--- trunk/TOOLS/realcodecs/rv30.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/realcodecs/rv30.c	Wed May 13 04:58:57 2009	(r29305)
@@ -212,7 +212,7 @@ void hexdump(void *pos, int len) {
 	int lines=(len+15)>>4;
 	while(lines--) {
 		int len1=len, i;
-		fprintf(stderr, "%0x  ", cpos); 
+		fprintf(stderr, "%0x  ", cpos);
 		cpos1=cpos;
 		for (i=0;i<16;i++) {
 			if (len1>0) {
@@ -232,7 +232,7 @@ void hexdump(void *pos, int len) {
 			}
 			len--;
 		}
-		fputs("\n", stderr);		
+		fputs("\n", stderr);
 	}
 	fputc('\n', stderr);
 }

Modified: trunk/TOOLS/realcodecs/sipr.c
==============================================================================
--- trunk/TOOLS/realcodecs/sipr.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/realcodecs/sipr.c	Wed May 13 04:58:57 2009	(r29305)
@@ -206,7 +206,7 @@ void hexdump(void *pos, int len) {
 	int lines=(len+15)>>4;
 	while(lines--) {
 		int len1=len, i;
-		fprintf(stderr, "%0x  ", cpos); 
+		fprintf(stderr, "%0x  ", cpos);
 		cpos1=cpos;
 		for (i=0;i<16;i++) {
 			if (len1>0) {
@@ -226,7 +226,7 @@ void hexdump(void *pos, int len) {
 			}
 			len--;
 		}
-		fputs("\n", stderr);		
+		fputs("\n", stderr);
 	}
 	fputc('\n', stderr);
 }
@@ -246,7 +246,7 @@ static int pkno=0;
 ulong RADecode(ulong p1,ulong p2,ulong p3,ulong p4,ulong* p5,ulong p6) {
 	ulong result;
 	int x,y;
-	
+
 	fprintf(stderr, "RADecode(ulong ctx=0x%0lx, ", p1);
 	fprintf(stderr, "ulong src=0x%0lx,\n", p2);
 	fprintf(stderr, "ulong len=0x%0lx,", p3);
@@ -375,7 +375,7 @@ ulong RAInitDecoder(ulong p1,ulong p2) {
 	memset(temp2,0x77,256);
 	memcpy(temp2,temp[6],16);
 	temp[6]=temp2;
-	
+
 	result=(*raInitDecoder)(p1,temp);
 	hexdump((void*)temp[6], 32);
 #endif
@@ -445,7 +445,7 @@ ulong RASetFlavor(ulong p1,ulong p2,ulon
 
 	fputs("######################## FLAVOR PROPERTIES ###################\n\n", stderr);
 #endif
-	
+
 	return result;
 }
 

Modified: trunk/TOOLS/subrip.c
==============================================================================
--- trunk/TOOLS/subrip.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/subrip.c	Wed May 13 04:58:57 2009	(r29305)
@@ -210,7 +210,7 @@ main(int argc, char **argv)
 	spudec_assemble(spudec, packet, packet_len, pts100);
 	if (spudec->queue_head) {
 		spudec_heartbeat(spudec, spudec->queue_head->start_pts);
-	if (spudec_changed(spudec)) 
+	if (spudec_changed(spudec))
 	    spudec_draw(spudec, draw_alpha);
 	}
     }

Modified: trunk/TOOLS/vivodump.c
==============================================================================
--- trunk/TOOLS/vivodump.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/vivodump.c	Wed May 13 04:58:57 2009	(r29305)
@@ -66,9 +66,9 @@ int height=240;
 static int h263_decode_picture_header(unsigned char *b_ptr)
 {
     int i;
-        
+
     for(i=0;i<16;i++) printf(" %02X",b_ptr[i]); printf("\n");
-    
+
     buffer=b_ptr;
     bufptr=bitcnt=buf=0;
 
@@ -193,8 +193,8 @@ mux=muxer_new_stream(avi,MUXER_TYPE_VIDE
 mux->buffer_size=0x200000;
 mux->buffer=malloc(mux->buffer_size);
 
-mux->h.dwScale=1; 
-mux->h.dwRate=10; 
+mux->h.dwScale=1;
+mux->h.dwRate=10;
 
 mux->bih=malloc(sizeof(BITMAPINFOHEADER));
 mux->bih->biSize=sizeof(BITMAPINFOHEADER);
@@ -256,7 +256,7 @@ while((c=fgetc(f))>=0){
 	h263_decode_picture_header(mux->buffer);
 	muxer_write_chunk(mux,mux->buffer_len,0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
 	mux->buffer_len=0;
-	
+
 	if((v_id&0xF0)==0x10) fprintf(stderr,"hmm. last video packet %02X\n",v_id);
     }
     flag2=0;

Modified: trunk/TOOLS/vobshift.py
==============================================================================
--- trunk/TOOLS/vobshift.py	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/vobshift.py	Wed May 13 04:58:57 2009	(r29305)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-#usage: 
+#usage:
 #
 # vobshift.py in.idx out.idx -8.45
 #
@@ -35,7 +35,7 @@ def delta2text(d):
 
 def shift(line,seconds):
 	triplet = tripletize(line)
-	
+
 	base = text2delta(triplet[1])
 	base = base + datetime.timedelta(seconds=seconds)
 	base = delta2text(base)
@@ -52,7 +52,7 @@ o = open(OUTFILE,'wt')
 for line in open(INFILE):
     if line.startswith('timestamp'):
 	line = shift(line,DIFF)
-    
+
     o.write(line)
 
 o.close()

Modified: trunk/TOOLS/w32codec_dl.pl
==============================================================================
--- trunk/TOOLS/w32codec_dl.pl	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/TOOLS/w32codec_dl.pl	Wed May 13 04:58:57 2009	(r29305)
@@ -33,7 +33,7 @@ CC: while (<CCONF>)
 	next CC if (m/^[ \t]*\;/);
 	s/\;.*//g;
 	s/#.*//g;
-	
+
 	if (m/^videocodec (.*)/)
 	{
 		$codec = $1;
@@ -105,17 +105,17 @@ close CODEC_CABS;
 sub find_codec
 {
 	my ($fourcc) = @_;
-	
+
 	my $guid = sprintf ("%08X", unpack ("V", $fourcc))."-0000-0010-8000-00AA00389B71";
-	
+
 	my $req = HTTP::Request->new (POST => "http://activex.microsoft.com/objects/ocget.dll");
 	$req->header ('Accept', '*/*');
 	$req->content_type ('application/x-www-form-urlencoded');
 	$req->content ("CLSID=%7B${guid}%7D\n");
 	#$req->content ('CLSID={'.${guid}.'}');
-	
+
 	my $res = $ua->request ($req);
-	
+
 	if ($res->is_success) {
 		print "Lookup returned success... weird!\n";
 		return 1;
@@ -147,17 +147,17 @@ sub find_codec
 sub get_codec
 {
 	my ($url) = @_;
-	
+
 	my $req = HTTP::Request->new (GET => $url);
 	$req->header ("Accept", "*/*");
 	my $res = $ua->request ($req);
-	
+
 	if ($res->is_success)
 	{
 		open TMP, ">tmp.cab" or die "Unable to open tmp.cab";
 		print TMP $res->content;
 		close TMP;
-		
+
 		system "cabextract tmp.cab";
 		unlink "tmp.cab";
 	}

Modified: trunk/asxparser.c
==============================================================================
--- trunk/asxparser.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/asxparser.c	Wed May 13 04:58:57 2009	(r29305)
@@ -49,7 +49,7 @@ asx_list_remove(void* list_ptr,void* ent
   if(e == -1) return; // Not found
 
   if(free_func != NULL) free_func(list[e]);
-  
+
   if(c == 1) { // Only one entry, we drop all
     free(list);
     *(void**)list_ptr = NULL;
@@ -61,7 +61,7 @@ asx_list_remove(void* list_ptr,void* ent
 
   list = (void*)realloc(list,(c-1)*sizeof(void*));
   list[c-1] = NULL;
-  
+
   *(void***)list_ptr = list;
 }
 
@@ -167,22 +167,22 @@ asx_parse_attribs(ASX_Parser_t* parser,c
     strncpy(val,ptr1,ptr2-ptr1);
     val[ptr2-ptr1] = '\0';
     n_attrib++;
-    
+
     attribs = (char**)realloc(attribs,(2*n_attrib+1)*sizeof(char*));
     attribs[n_attrib*2-2] = attrib;
     attribs[n_attrib*2-1] = val;
-    
+
     ptr1 = ptr2+1;
   }
-  
+
   if(n_attrib > 0)
     attribs[n_attrib*2] = NULL;
 
   *_attribs = attribs;
-  
+
   return n_attrib;
 }
- 
+
 /*
  * Return -1 on error, 0 when nothing is found, 1 on sucess
  */
@@ -215,11 +215,11 @@ asx_get_element(ASX_Parser_t* parser,cha
 	parser->line = ls[i].line;
 	break;
       }
-      
+
     }
     if( i < parser->ret_stack_size) {
       i++;
-      if( i < parser->ret_stack_size)	
+      if( i < parser->ret_stack_size)
 	memmove(parser->ret_stack,parser->ret_stack+i, (parser->ret_stack_size - i)*sizeof(ASX_LineSave_t));
       parser->ret_stack_size -= i;
       if(parser->ret_stack_size > 0)
@@ -242,7 +242,7 @@ asx_get_element(ASX_Parser_t* parser,cha
     }
     //ptr1 = strchr(ptr1,'<');
     if(!ptr1 || ptr1[1] == '\0') return 0; // Nothing found
-    
+
     if(strncmp(ptr1,"<!--",4) == 0) { // Comments
       for( ; strncmp(ptr1,"-->",3) != 0 ; ptr1++) {
 	if(ptr1[0] == '\0') {
@@ -260,7 +260,7 @@ asx_get_element(ASX_Parser_t* parser,cha
       break;
     }
   }
-  
+
   // Is this space skip very useful ??
   for(ptr1++; strchr(SPACE,ptr1[0]) != NULL; ptr1++) { // Skip space
     if(ptr1[0] == '\0') {
@@ -268,7 +268,7 @@ asx_get_element(ASX_Parser_t* parser,cha
       return -1;
     }
     if(ptr1[0] == '\n') parser->line++;
-  } 
+  }
 
   for(ptr2 = ptr1; strchr(LETTER,*ptr2) != NULL;ptr2++) { // Go to end of name
     if(*ptr2 == '\0'){
@@ -292,10 +292,10 @@ asx_get_element(ASX_Parser_t* parser,cha
   }
   attrib_line = parser->line;
 
-  
+
 
   for(ptr3 = ptr2; ptr3[0] != '\0'; ptr3++) { // Go to element end
-    if(ptr3[0] == '"') quotes ^= 1;  
+    if(ptr3[0] == '"') quotes ^= 1;
     if(!quotes && (ptr3[0] == '>' || strncmp(ptr3,"/>",2) == 0))
       break;
     if(ptr3[0] == '\n') parser->line++;
@@ -344,7 +344,7 @@ asx_get_element(ASX_Parser_t* parser,cha
 	}
 	continue;
       }
-      if(ptr4 == NULL || ptr4[1] == '\0') { 
+      if(ptr4 == NULL || ptr4[1] == '\0') {
 	mp_msg(MSGT_PLAYTREE,MSGL_ERR,"At line %d : EOB reached while parsing %s element body",parser->line,element);
 	free(element);
 	if(attribs) free(attribs);
@@ -369,7 +369,7 @@ asx_get_element(ASX_Parser_t* parser,cha
 	  ptr4++;
 	  body = malloc(ptr4-ptr3+1);
 	  strncpy(body,ptr3,ptr4-ptr3);
-	  body[ptr4-ptr3] = '\0';	  
+	  body[ptr4-ptr3] = '\0';
 	}
 	break;
       } else {
@@ -419,7 +419,7 @@ asx_get_element(ASX_Parser_t* parser,cha
 static void
 asx_parse_param(ASX_Parser_t* parser, char** attribs, play_tree_t* pt) {
   char *name,*val;
-  
+
   name = asx_get_attrib("NAME",attribs);
   if(!name) {
     asx_warning_attrib_required(parser,"PARAM" ,"NAME" );
@@ -502,7 +502,7 @@ asx_parse_entryref(ASX_Parser_t* parser,
   free_stream(stream);
   free(href);
   //mp_msg(MSGT_PLAYTREE,MSGL_INFO,"Need to implement entryref\n");
-    
+
   return pt;
 }
 
@@ -539,7 +539,7 @@ asx_parse_entry(ASX_Parser_t* parser,cha
   return ref;
 
 }
-  
+
 
 static play_tree_t*
 asx_parse_repeat(ASX_Parser_t* parser,char* buffer,char** _attribs) {
@@ -690,7 +690,7 @@ asx_parser_build_tree(char* buffer,int d
 
   if(!list) {
     play_tree_free(asx,1);
-    
+
     return NULL;
   }
 

Modified: trunk/asxparser.h
==============================================================================
--- trunk/asxparser.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/asxparser.h	Wed May 13 04:58:57 2009	(r29305)
@@ -15,7 +15,7 @@ struct ASX_Parser_t {
   char* last_body;
   int deep;
 };
-  
+
 ASX_Parser_t*
 asx_parser_new(void);
 

Modified: trunk/cfg-common-opts.h
==============================================================================
--- trunk/cfg-common-opts.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/cfg-common-opts.h	Wed May 13 04:58:57 2009	(r29305)
@@ -38,7 +38,7 @@
 	{"cuefile", "-cuefile has been removed, use cue://filename:N where N is the track number.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"cdrom-device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #ifdef CONFIG_DVDREAD
-	{"dvd-device", &dvd_device,  CONF_TYPE_STRING, 0, 0, 0, NULL}, 
+	{"dvd-device", &dvd_device,  CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"dvd", "-dvd N has been removed, use dvd://N instead.\n" , CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL},
@@ -63,8 +63,8 @@
 	{"cookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nocookies", &network_cookies_enabled, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"cookies-file", &cookies_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
-	{"prefer-ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, NULL},	
-	{"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, NULL},	
+	{"prefer-ipv4", &network_prefer_ipv4, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"ipv4-only-proxy", &network_ipv4_only_proxy, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"reuse-socket", &reuse_socket, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
 	{"noreuse-socket", &reuse_socket, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
 #ifdef HAVE_AF_INET6
@@ -91,13 +91,13 @@
 	{"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_LIVE555 */
 #ifdef CONFIG_NETWORK
-        {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL},	
+        {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL},
         {"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL},
 #else
         {"rtsp-port", "MPlayer was compiled without network support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
         {"rtsp-destination", "MPlayer was compiled without network support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif /* CONFIG_NETWORK */
-  
+
 // ------------------------- demuxer options --------------------
 
 	// number of frames to play/convert
@@ -179,7 +179,7 @@
 
 	// set A-V sync correction speed (0=disables it):
 	{"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL},
-	
+
 	// force video/audio rate:
 	{"fps", &force_fps, CONF_TYPE_DOUBLE, CONF_MIN, 0, 0, NULL},
 	{"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL},
@@ -275,7 +275,7 @@
 	{"noflip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"flip-hebrew-commas", &fribidi_flip_commas, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"noflip-hebrew-commas", &fribidi_flip_commas, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-#else 
+#else
 	{"fribidi-charset", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{"flip-hebrew", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{"noflip-hebrew", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
@@ -284,7 +284,7 @@
 #endif /* CONFIG_FRIBIDI */
 #ifdef CONFIG_ICONV
 	{"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#endif	
+#endif
 	{"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL},
 	{"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL},
 	{"autosub", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL},

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/cfg-common.h	Wed May 13 04:58:57 2009	(r29305)
@@ -243,7 +243,7 @@ const m_option_t mfopts_conf[]={
 
 #include "libaf/af.h"
 extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c
-const m_option_t audio_filter_conf[]={       
+const m_option_t audio_filter_conf[]={
 	{"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
         {"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}

Modified: trunk/cfg-mencoder.h
==============================================================================
--- trunk/cfg-mencoder.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/cfg-mencoder.h	Wed May 13 04:58:57 2009	(r29305)
@@ -200,20 +200,20 @@ const m_option_t mencoder_opts[]={
 
 	{"pass", "-pass has been removed, use -lavcopts vpass=n, -xvidencopts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{"passlogfile", &passtmpfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
-	
+
 	{"vobsubout", &vobsub_out, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
 	{"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 31, NULL},
 	{"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
 
 	{"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-	
+
 	{"encodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"noencodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-	
+
 	{"odml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
 	{"noodml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
-	
+
 	// info header strings
 	{"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 
@@ -256,7 +256,7 @@ const m_option_t mencoder_opts[]={
 	{"mpegopts",  mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #ifdef CONFIG_LIBAVFORMAT
 	{"lavfopts",  lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
-#endif	
+#endif
 
 #include "cfg-common-opts.h"
 

Modified: trunk/cfg-mplayer.h
==============================================================================
--- trunk/cfg-mplayer.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/cfg-mplayer.h	Wed May 13 04:58:57 2009	(r29305)
@@ -74,7 +74,7 @@ const m_option_t tvscan_conf[]={
 /*
  * CONF_TYPE_FUNC_FULL :
  * allows own implementations 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)
@@ -122,7 +122,7 @@ const m_option_t mplayer_opts[]={
             CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	{"noalsa", "-noalsa has been removed. Remove it from your config file.\n",
             CONF_TYPE_PRINT, 0, 0, 0, NULL},
-	{"edlout", &edl_output_filename,  CONF_TYPE_STRING, 0, 0, 0, NULL}, 
+	{"edlout", &edl_output_filename,  CONF_TYPE_STRING, 0, 0, 0, NULL},
 
 #ifdef CONFIG_X11
 	{"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -147,10 +147,10 @@ const m_option_t mplayer_opts[]={
 	    CONF_TYPE_PRINT, 0, 0, 0, NULL},
 
 #if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
-       {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
-       {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
-       {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL}, 
-#endif 
+       {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
+       {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
+       {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
+#endif
 
 #ifdef CONFIG_FBDEV
 	{"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -196,7 +196,7 @@ const m_option_t mplayer_opts[]={
 
 	{"grabpointer", &vo_grabpointer, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nograbpointer", &vo_grabpointer, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-	
+
     {"adapter", &vo_adapter_num, CONF_TYPE_INT, CONF_RANGE, 0, 5, NULL},
     {"refreshrate",&vo_refresh_rate,CONF_TYPE_INT,CONF_RANGE, 0,100, NULL},
 	{"wid", &WinID, CONF_TYPE_INT64, 0, 0, 0, NULL},
@@ -307,7 +307,7 @@ const m_option_t mplayer_opts[]={
 
 	{"gui", "The -gui option will only work as the first command line argument.\n", CONF_TYPE_PRINT, 0, 0, 0, (void *)1},
 	{"nogui", "The -nogui option will only work as the first command line argument.\n", CONF_TYPE_PRINT, 0, 0, 0, (void *)1},
-      
+
 #ifdef CONFIG_GUI
 	{"skin", &skinName, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
 	{"enqueue", &enqueue, CONF_TYPE_FLAG, 0, 0, 1, NULL},

Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/codec-cfg.c	Wed May 13 04:58:57 2009	(r29305)
@@ -14,7 +14,7 @@
 #define DEBUG
 
 //disable asserts
-#define NDEBUG 
+#define NDEBUG
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -161,7 +161,7 @@ static int add_to_format(char *s, char *
 
 	        {"RGB4",  IMGFMT_RGB|4},
 	        {"RGB8",  IMGFMT_RGB|8},
-		{"RGB15", IMGFMT_RGB|15}, 
+		{"RGB15", IMGFMT_RGB|15},
 		{"RGB16", IMGFMT_RGB|16},
 		{"RGB24", IMGFMT_RGB|24},
 		{"RGB32", IMGFMT_RGB|32},
@@ -248,7 +248,7 @@ static int add_to_inout(char *sfmt, char
 
 	if (*(--sfmt) != '\0')
 		goto err_out_parse_error;
-        
+
 	return 1;
 err_out_too_many:
 	mp_msg(MSGT_CODECCFG,MSGL_ERR,MSGTR_TooManyOut);
@@ -499,16 +499,16 @@ int parse_codec_cfg(const char *cfgfile)
 	int *nr_codecsp;
 	int codec_type;		/* TYPE_VIDEO/TYPE_AUDIO */
 	int tmp, i;
-	
+
 	// in case we call it a second time
 	codecs_uninit_free();
-	
+
 	nr_vcodecs = 0;
 	nr_acodecs = 0;
 
 	if(cfgfile==NULL) {
 #ifdef CODECS2HTML
-	  	return 0; 
+	  	return 0;
 #else
 		video_codecs = builtin_video_codecs;
 		audio_codecs = builtin_audio_codecs;
@@ -517,7 +517,7 @@ int parse_codec_cfg(const char *cfgfile)
 		return 1;
 #endif
 	}
-	
+
 	mp_msg(MSGT_CODECCFG,MSGL_V,MSGTR_ReadingFile, cfgfile);
 
 	if ((fp = fopen(cfgfile, "r")) == NULL) {
@@ -532,7 +532,7 @@ int parse_codec_cfg(const char *cfgfile)
 	read_nextline = 1;
 
 	/*
-	 * this only catches release lines at the start of 
+	 * this only catches release lines at the start of
 	 * codecs.conf, before audiocodecs and videocodecs.
 	 */
 	while ((tmp = get_token(1, 1)) == RET_EOL)
@@ -593,11 +593,11 @@ int parse_codec_cfg(const char *cfgfile)
 			memset(codec->fourcc, 0xff, sizeof(codec->fourcc));
 			memset(codec->outfmt, 0xff, sizeof(codec->outfmt));
 			memset(codec->infmt, 0xff, sizeof(codec->infmt));
-                        
+
 			if (get_token(1, 1) < 0)
 				goto err_out_parse_error;
 			for (i = 0; i < *nr_codecsp - 1; i++) {
-				if(( (*codecsp)[i].name!=NULL) && 
+				if(( (*codecsp)[i].name!=NULL) &&
 				    (!strcmp(token[0], (*codecsp)[i].name)) ) {
 					mp_msg(MSGT_CODECCFG,MSGL_ERR,MSGTR_CodecNameNotUnique, token[0]);
 					goto err_out_print_linenum;
@@ -797,7 +797,7 @@ codecs_t* find_codec(unsigned int fourcc
 				}
 			}
 		}
-	} else 
+	} else
 #endif
         {
 		if (audioflag) {
@@ -878,7 +878,7 @@ void list_codecs(int audioflag){
 			  mp_msg(MSGT_CODECCFG,MSGL_INFO,"%-11s %-9s %s  %s  [%s]\n",c->name,c->drv,s,c->info,c->dll);
 			else
 			  mp_msg(MSGT_CODECCFG,MSGL_INFO,"%-11s %-9s %s  %s\n",c->name,c->drv,s,c->info);
-			
+
 		}
 
 }
@@ -905,7 +905,7 @@ void parsehtml(FILE *f1,FILE *f2,codecs_
                 continue;
             }
             d=fgetc(f1);
-            
+
             switch(d){
             case '.':
                 return; // end of section
@@ -971,7 +971,7 @@ static void print_int_array(const unsign
 static void print_char_array(const unsigned char* a, int size)
 {
 	printf("{ ");
-	while (size--) 
+	while (size--)
 	    if((*a)<10)
 		printf("%d%s", *a++, size?", ":"");
 	    else
@@ -1014,15 +1014,15 @@ int main(int argc, char* argv[])
 		nm[0] = "builtin_video_codecs";
 		cod[0] = video_codecs;
 		nr[0] = nr_vcodecs;
-		
+
 		nm[1] = "builtin_audio_codecs";
 		cod[1] = audio_codecs;
 		nr[1] = nr_acodecs;
-		
+
 		printf("/* GENERATED FROM %s, DO NOT EDIT! */\n\n",argv[1]);
 		printf("#include <stddef.h>\n",argv[1]);
 		printf("#include \"codec-cfg.h\"\n\n",argv[1]);
-		
+
 		for (i=0; i<2; i++) {
 		  	printf("const codecs_t %s[] = {\n", nm[i]);
 			for (j = 0; j < nr[i]; j++) {
@@ -1030,28 +1030,28 @@ int main(int argc, char* argv[])
 
 				print_int_array(cod[i][j].fourcc, CODECS_MAX_FOURCC);
 				printf(", /* fourcc */\n");
-				
+
 				print_int_array(cod[i][j].fourccmap, CODECS_MAX_FOURCC);
 				printf(", /* fourccmap */\n");
-				
+
 				print_int_array(cod[i][j].outfmt, CODECS_MAX_OUTFMT);
 				printf(", /* outfmt */\n");
-				
+
 				print_char_array(cod[i][j].outflags, CODECS_MAX_OUTFMT);
 				printf(", /* outflags */\n");
-				
+
 				print_int_array(cod[i][j].infmt, CODECS_MAX_INFMT);
 				printf(", /* infmt */\n");
-				
+
 				print_char_array(cod[i][j].inflags, CODECS_MAX_INFMT);
 				printf(", /* inflags */\n");
-				
+
 				print_string(cod[i][j].name);    printf(", /* name */\n");
 				print_string(cod[i][j].info);    printf(", /* info */\n");
 				print_string(cod[i][j].comment); printf(", /* comment */\n");
 				print_string(cod[i][j].dll);     printf(", /* dll */\n");
 				print_string(cod[i][j].drv);     printf(", /* drv */\n");
-				
+
 				printf("{ 0x%08lx, %hu, %hu,",
 				       cod[i][j].guid.f1,
 				       cod[i][j].guid.f2,
@@ -1071,7 +1071,7 @@ int main(int argc, char* argv[])
 
         f1=fopen("DOCS/tech/codecs-in.html","rb"); if(!f1) exit(1);
         f2=fopen("DOCS/codecs-status.html","wb"); if(!f2) exit(1);
-        
+
         while((c=fgetc(f1))>=0){
             if(c!='%'){
                 fputc(c,f2);
@@ -1133,13 +1133,13 @@ int main(int argc, char* argv[])
                 fseek(f1,pos,SEEK_SET);
                 skiphtml(f1);
 //void parsehtml(FILE *f1,FILE *f2,codecs_t *codec,int section,int dshow){
-                
+
                 continue;
             }
             fputc(c,f2);
             fputc(d,f2);
         }
-        
+
         fclose(f2);
         fclose(f1);
 	return 0;
@@ -1202,7 +1202,7 @@ next:
 		    for(j=0;j<8;j++) printf(" %02X",c->guid.f4[j]);
 		    printf("\n");
 
-		    
+
 		}
 	}
 	if (!state) {

Modified: trunk/command.c
==============================================================================
--- trunk/command.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/command.c	Wed May 13 04:58:57 2009	(r29305)
@@ -1888,7 +1888,7 @@ static int mp_property_teletext_common(m
 {
     int val,result;
     int base_ioctl=(int)prop->priv;
-    /* 
+    /*
       for teletext's GET,SET,STEP ioctls this is not 0
       SET is GET+1
       STEP is GET+2

Modified: trunk/cpudetect.c
==============================================================================
--- trunk/cpudetect.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/cpudetect.c	Wed May 13 04:58:57 2009	(r29305)
@@ -29,8 +29,8 @@ CpuCaps gCpuCaps;
 #include <proto/exec.h>
 #endif
 
-/* Thanks to the FreeBSD project for some of this cpuid code, and 
- * help understanding how to use it.  Thanks to the Mesa 
+/* Thanks to the FreeBSD project for some of this cpuid code, and
+ * help understanding how to use it.  Thanks to the Mesa
  * team for SSE support detection and more cpu detect code.
  */
 
@@ -52,19 +52,19 @@ static int has_cpuid(void)
                           "pushfl\n\t"
                           "pop %0\n\t"
                           "mov %0, %1\n\t"
-                          
+
                           /* ... Toggle the ID bit in one copy and store */
                           /*     to the EFLAGS reg */
                           "xor $0x200000, %0\n\t"
                           "push %0\n\t"
                           "popfl\n\t"
-                          
+
                           /* ... Get the (hopefully modified) EFLAGS */
                           "pushfl\n\t"
                           "pop %0\n\t"
                           : "=a" (a), "=c" (c)
                           :
-                          : "cc" 
+                          : "cc"
                           );
 
 	return a != c;
@@ -86,7 +86,7 @@ do_cpuid(unsigned int ax, unsigned int *
 	("mov %%"REG_b", %%"REG_S"\n\t"
          "cpuid\n\t"
          "xchg %%"REG_b", %%"REG_S
-         : "=a" (p[0]), "=S" (p[1]), 
+         : "=a" (p[0]), "=S" (p[1]),
            "=c" (p[2]), "=d" (p[3])
          : "0" (ax));
 #endif
@@ -274,7 +274,7 @@ LONG CALLBACK win32_sig_handler_sse(EXCE
    if(ep->ExceptionRecord->ExceptionCode==EXCEPTION_ILLEGAL_INSTRUCTION){
       mp_msg(MSGT_CPUDETECT,MSGL_V, "SIGILL, " );
       ep->ContextRecord->Eip +=3;
-      gCpuCaps.hasSSE=0;       
+      gCpuCaps.hasSSE=0;
 	  return EXCEPTION_CONTINUE_EXECUTION;
    }
    return EXCEPTION_CONTINUE_SEARCH;
@@ -305,7 +305,7 @@ ULONG _System os2_sig_handler_sse( PEXCE
  * and RedHat patched 2.2 kernels that have broken exception handling
  * support for user space apps that do SSE.
  */
- 
+
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #define SSE_SYSCTL_NAME "hw.instruction_sse"
 #elif defined(__APPLE__)
@@ -433,7 +433,7 @@ static void sigill_handler (int sig)
         signal (sig, SIG_DFL);
         raise (sig);
     }
-    
+
     canjump = 0;
     siglongjmp (jmpbuf, 1);
 }
@@ -455,7 +455,7 @@ void GetCpuCaps( CpuCaps *caps)
 	caps->hasSSE4a=0;
 	caps->isX86=0;
 	caps->hasAltiVec = 0;
-#if HAVE_ALTIVEC   
+#if HAVE_ALTIVEC
 #ifdef __APPLE__
 /*
   rip-off from ffmpeg altivec detection code.
@@ -467,7 +467,7 @@ void GetCpuCaps( CpuCaps *caps)
                 size_t len = sizeof(has_vu);
                 int err;
 
-                err = sysctl(sels, 2, &has_vu, &len, NULL, 0);   
+                err = sysctl(sels, 2, &has_vu, &len, NULL, 0);
 
                 if (err == 0)
                         if (has_vu != 0)
@@ -488,12 +488,12 @@ void GetCpuCaps( CpuCaps *caps)
             signal (SIGILL, SIG_DFL);
           } else {
             canjump = 1;
-            
+
             __asm__ volatile ("mtspr 256, %0\n\t"
                           "vand %%v0, %%v0, %%v0"
                           :
                           : "r" (-1));
-            
+
             signal (SIGILL, SIG_DFL);
             caps->hasAltiVec = 1;
           }

Modified: trunk/debian/README.debian
==============================================================================
--- trunk/debian/README.debian	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/debian/README.debian	Wed May 13 04:58:57 2009	(r29305)
@@ -11,6 +11,6 @@ mplayer for Debian
   DEB_BUILD_OPTIONS like that:
 
   eyck at ghost$ DEB_BUILD_OPTIONS="--enable-streaming" fakeroot debian/rules binary
-  
+
 
 Dariush Pietrzak <eyck at ghost.anime.pl>  Sat Jan  5 20:28:23 CET 2002

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/debian/changelog	Wed May 13 04:58:57 2009	(r29305)
@@ -104,14 +104,14 @@ mplayer (0.90pre2-1) unstable; urgency=l
 
 mplayer (0.60-3) unstable; urgency=low
 
-  * install xvidix correctly 
+  * install xvidix correctly
 
  -- Dariush Pietrzak <eyck at ghost.anime.pl>  Sun, 17 Mar 2002 16:38:54 +0100
 
 mplayer (0.60-2) unstable; urgency=low
 
   * This is meaningless, just to mark that more then 2 months have passed
-    since last release and lots of thing in mplayer have changed. 
+    since last release and lots of thing in mplayer have changed.
 
  -- Dariush Pietrzak <eyck at ghost.anime.pl>  Thu,  7 Mar 2002 00:34:20 +0100
 
@@ -149,7 +149,7 @@ mplayer (0.50-3) unstable; urgency=low
 
 mplayer (0.50-2) unstable; urgency=low
 
-  * gui added to package/menu 
+  * gui added to package/menu
 
  -- Dariush Pietrzak <eyck at ghost.anime.pl>  Wed,  7 Nov 2001 11:31:46 +0100
 
@@ -161,31 +161,31 @@ mplayer (0.50-1) unstable; urgency=low
 
 mplayer (0.18-4) unstable; urgency=low
 
-  * Changes to debian packaging suggested Josip Rodin 
+  * Changes to debian packaging suggested Josip Rodin
 
  -- Dariush Pietrzak <eyck at ghost.forumakad.pl>  Wed, 22 Aug 2001 22:40:58 +0200
 
 mplayer (0.18-3) unstable; urgency=low
 
-  * fixed templates. 
+  * fixed templates.
 
  -- Dariush Pietrzak <eyck at ghost.tinet.pl>  Sat, 28 Jul 2001 09:45:45 +0200
 
 mplayer (0.18-2) unstable; urgency=low
 
-  * modified debian scripts 
+  * modified debian scripts
 
  -- Dariush Pietrzak <eyck at ghost.tinet.pl>  Fri, 27 Jul 2001 09:25:52 +0200
 
 mplayer (0.18-1) unstable; urgency=low
 
-  * lots of changes in mplayer 
+  * lots of changes in mplayer
 
  -- Dariush Pietrzak <eyck at incubus.ar.lublin.pl>  Mon, 25 Jun 2001 15:59:18 +0200
 
 mplayer (0.17a-2) unstable; urgency=low
 
-  * mplayer.conf file, automatic menu files update 
+  * mplayer.conf file, automatic menu files update
 
  -- Dariush Pietrzak <eyck at incubus.ar.lublin.pl>  Sun, 20 May 2001 22:50:41 +0200
 

Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/debian/control	Wed May 13 04:58:57 2009	(r29305)
@@ -8,7 +8,7 @@ Build-Depends: libgtk1.2-dev | libgtk2.0
 Package: mplayer
 Architecture: any
 Depends: ${shlibs:Depends},debconf
-Description: The Ultimate Movie Player 
+Description: The Ultimate Movie Player
  MPlayer is a movie player for LINUX (runs on many other Unices, and non-x86
  CPUs, see the ports section). It plays most MPEG, VOB, AVI, OGG/OGM, VIVO,
  ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/debian/rules	Wed May 13 04:58:57 2009	(r29305)
@@ -28,7 +28,7 @@ build-stamp:
 	dh_testdir
 
 	# commands to compile the package.
-	${MAKE} 
+	${MAKE}
 
 	touch build-stamp
 
@@ -60,7 +60,7 @@ binary-arch: build
 		usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz
 
 
-	dh_installdebconf	
+	dh_installdebconf
 	dh_installdocs -X.svn -Xmplayer.1 DOCS/*
 	dh_installexamples etc/example.conf etc/dvb-menu.conf etc/input.conf etc/menu.conf
 	dh_installmenu
@@ -91,7 +91,7 @@ binary-arch: build
 
 # Must have debmake installed for this to work. Otherwise please copy
 # /usr/bin/debstd into the debian directory and change debstd to debian/debstd
-#	debstd 
+#	debstd
 #	dpkg-gencontrol -isp
 #	chown -R root.root debian/tmp
 #	chmod -R go=rX debian/tmp

Modified: trunk/drivers/3dfx.h
==============================================================================
--- trunk/drivers/3dfx.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/drivers/3dfx.h	Wed May 13 04:58:57 2009	(r29305)
@@ -346,7 +346,7 @@ typedef struct voodoo_yuv_fb_t voodoo_yu
 #define GRA_I	0x3ce
 #define GRA_D	0x3cf
 
-#ifndef FB_ACCEL_3DFX_BANSHEE 
+#ifndef FB_ACCEL_3DFX_BANSHEE
 #define FB_ACCEL_3DFX_BANSHEE 31
 #endif
 
@@ -362,12 +362,12 @@ typedef struct voodoo_yuv_fb_t voodoo_yu
 
 #define XYREG(x,y)		(((((unsigned long)y) & 0x1FFF) << 16) | (((unsigned long)x) & 0x1FFF))
 
-//#define TDFXFB_DEBUG 
+//#define TDFXFB_DEBUG
 #ifdef TDFXFB_DEBUG
 #define DPRINTK(a,b...) printk(KERN_DEBUG "fb: %s: " a, __FUNCTION__ , ## b)
 #else
 #define DPRINTK(a,b...)
-#endif 
+#endif
 
 /* ------------------------------------------------------------------------- */
 

Modified: trunk/drivers/hacking.ati
==============================================================================
--- trunk/drivers/hacking.ati	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/drivers/hacking.ati	Wed May 13 04:58:57 2009	(r29305)
@@ -27,7 +27,7 @@ MPP   - Miscellaneous peripheral port. (
 	protection mechanism)
 OV    - Video overlay (YUV BES) (include subpictures, gamma correction and
         adaptive deinterlacing)
-CAP0  - Video capturing 
+CAP0  - Video capturing
 CAP1  - Video capturing (second unit)
 RT    - Rage theatre: video encoding and mixing
 MUX   - video muxer
@@ -227,7 +227,7 @@ OUTREG(OVERLAY_Y_X_END,((drw_x+drw_w)<<1
  ************************************
 
 #define OV0_Y_X_START                          0x0400
-#define OV0_Y_X_END                            0x0404  
+#define OV0_Y_X_END                            0x0404
 
 ...
 

Modified: trunk/drivers/mga_vid.c
==============================================================================
--- trunk/drivers/mga_vid.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/drivers/mga_vid.c	Wed May 13 04:58:57 2009	(r29305)
@@ -63,7 +63,7 @@
 
 #include "mga_vid.h"
 
-#ifdef CONFIG_MTRR 
+#ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
 
@@ -80,19 +80,19 @@
 
 #define DEFAULT_MGA_VID_MAJOR 178
 
-#ifndef PCI_DEVICE_ID_MATROX_G200_PCI 
+#ifndef PCI_DEVICE_ID_MATROX_G200_PCI
 #define PCI_DEVICE_ID_MATROX_G200_PCI 0x0520
 #endif
 
-#ifndef PCI_DEVICE_ID_MATROX_G200_AGP 
+#ifndef PCI_DEVICE_ID_MATROX_G200_AGP
 #define PCI_DEVICE_ID_MATROX_G200_AGP 0x0521
 #endif
 
-#ifndef PCI_DEVICE_ID_MATROX_G400 
+#ifndef PCI_DEVICE_ID_MATROX_G400
 #define PCI_DEVICE_ID_MATROX_G400 0x0525
 #endif
 
-#ifndef PCI_DEVICE_ID_MATROX_G550 
+#ifndef PCI_DEVICE_ID_MATROX_G550
 #define PCI_DEVICE_ID_MATROX_G550 0x2527
 #endif
 
@@ -208,12 +208,12 @@ typedef struct bes_registers_s
 	uint32_t beshiscal;
 	//BES Horizontal source start [10.14] (for scaling)
 	uint32_t beshsrcst;
-	//BES Horizontal source ending [10.14] (for scaling) 
+	//BES Horizontal source ending [10.14] (for scaling)
 	uint32_t beshsrcend;
-	//BES Horizontal source last 
+	//BES Horizontal source last
 	uint32_t beshsrclst;
 
-	
+
 	//BES Vertical coord
 	uint32_t besvcoord;
 	//BES Vertical inverse scaling [5.14]
@@ -291,7 +291,7 @@ typedef struct crtc2_registers_s
 
 /*CRTC2 registers*/
 #define XMISCCTRL  0x1e
-#define C2CTL       0x3c10 
+#define C2CTL       0x3c10
 #define C2DATACTL   0x3c4c
 #define C2MISC      0x3c44
 #define C2HPARAM    0x3c14
@@ -323,7 +323,7 @@ typedef struct crtc2_registers_s
 #define BESA1CORG   0x3d10
 #define BESA1ORG    0x3d00
 
-#define BESA2C3ORG  0x3d64 
+#define BESA2C3ORG  0x3d64
 #define BESA2CORG   0x3d14
 #define BESA2ORG    0x3d04
 
@@ -381,7 +381,7 @@ typedef struct mga_card_s {
 	uint32_t vid_overlay_on;
 
 	uint8_t *mmio_base;
-	uint32_t mem_base; 
+	uint32_t mem_base;
 	int src_base;	// YUV buffer position in video memory
 	uint32_t ram_size;	// how much megabytes videoram we have
 	uint32_t top_reserved;	// reserved space for console font (matroxfb + fastfont)
@@ -391,7 +391,7 @@ typedef struct mga_card_s {
 
 	struct pci_dev *pci_dev;
 
-	mga_vid_config_t config; 
+	mga_vid_config_t config;
 	int configured; // set to 1 when the card is configured over ioctl
 
 	int colkey_saved;
@@ -400,7 +400,7 @@ typedef struct mga_card_s {
 	unsigned char colkey_mask[4];
 
 	int irq; // = -1
-	int next_frame; 
+	int next_frame;
 } mga_card_t;
 
 #define MGA_MAX_CARDS 16
@@ -427,7 +427,7 @@ MODULE_PARM(major, "i");
 static void crtc2_frame_sel(mga_card_t * card, int frame)
 {
 switch(frame) {
-case 0:	
+case 0:
 	card->cregs.c2pl2startadd0=card->regs.besa1corg;
 	card->cregs.c2pl3startadd0=card->regs.besa1c3org;
 	card->cregs.c2startadd0=card->regs.besa1org;
@@ -463,7 +463,7 @@ static void mga_vid_frame_sel(mga_card_t
 	//we don't need the vcount protection as we're only hitting
 	//one register (and it doesn't seem to be double buffered)
 	card->regs.besctl = (card->regs.besctl & ~0x07000000) + (frame << 25);
-	writel( card->regs.besctl, card->mmio_base + BESCTL ); 
+	writel( card->regs.besctl, card->mmio_base + BESCTL );
 
 //	writel( card->regs.besglobctl + ((readl(card->mmio_base + VCOUNT)+2)<<16),
 	writel( card->regs.besglobctl + (MGA_VSYNC_POS<<16),
@@ -483,7 +483,7 @@ static void mga_vid_write_regs(mga_card_
 			card->mmio_base + BESGLOBCTL);
 
 	// color or coordinate keying
-	
+
 	if(restore && card->colkey_saved){
 	    // restore it
 	    card->colkey_saved=0;
@@ -491,12 +491,12 @@ static void mga_vid_write_regs(mga_card_
 #ifdef MP_DEBUG
 		printk("mga_vid: Restoring colorkey (ON: %d  %02X:%02X:%02X)\n",
 			card->colkey_on,card->colkey_color[0],card->colkey_color[1],card->colkey_color[2]);
-#endif		
+#endif
 
 		// Set color key registers:
 		writeb( XKEYOPMODE, card->mmio_base + PALWTADD);
 		writeb( card->colkey_on, card->mmio_base + X_DATAREG);
-		
+
 		writeb( XCOLKEY0RED, card->mmio_base + PALWTADD);
 		writeb( card->colkey_color[0], card->mmio_base + X_DATAREG);
 		writeb( XCOLKEY0GREEN, card->mmio_base + PALWTADD);
@@ -521,7 +521,7 @@ static void mga_vid_write_regs(mga_card_
 		// Get color key registers:
 		writeb( XKEYOPMODE, card->mmio_base + PALWTADD);
 		card->colkey_on=(unsigned char)readb(card->mmio_base + X_DATAREG) & 1;
-		
+
 		writeb( XCOLKEY0RED, card->mmio_base + PALWTADD);
 		card->colkey_color[0]=(unsigned char)readb(card->mmio_base + X_DATAREG);
 		writeb( XCOLKEY0GREEN, card->mmio_base + PALWTADD);
@@ -543,19 +543,19 @@ static void mga_vid_write_regs(mga_card_
 #ifdef MP_DEBUG
 		printk("mga_vid: Saved colorkey (ON: %d  %02X:%02X:%02X)\n",
 			card->colkey_on, card->colkey_color[0], card->colkey_color[1], card->colkey_color[2]);
-#endif		
+#endif
 
 	}
-	
+
 if(!restore){
 	writeb( XKEYOPMODE, card->mmio_base + PALWTADD);
 	writeb( card->config.colkey_on, card->mmio_base + X_DATAREG);
-	if ( card->config.colkey_on ) 
+	if ( card->config.colkey_on )
 	{
 		uint32_t r=0, g=0, b=0;
 
 		writeb( XMULCTRL, card->mmio_base + PALWTADD);
-		switch (readb (card->mmio_base + X_DATAREG)) 
+		switch (readb (card->mmio_base + X_DATAREG))
 		{
 			case BPP_8:
 				/* Need to look up the color index, just using color 0 for now. */
@@ -582,7 +582,7 @@ if(!restore){
 			break;
 		}
 
-		// Disable color keying on alpha channel 
+		// Disable color keying on alpha channel
 		writeb( XCOLMSK, card->mmio_base + PALWTADD);
 		writeb( 0x00, card->mmio_base + X_DATAREG);
 		writeb( X_COLKEY, card->mmio_base + PALWTADD);
@@ -609,10 +609,10 @@ if(!restore){
 }
 
 	// Backend Scaler
-	writel( card->regs.besctl,      card->mmio_base + BESCTL); 
+	writel( card->regs.besctl,      card->mmio_base + BESCTL);
 	if(card->is_g400)
-		writel( card->regs.beslumactl,  card->mmio_base + BESLUMACTL); 
-	writel( card->regs.bespitch,    card->mmio_base + BESPITCH); 
+		writel( card->regs.beslumactl,  card->mmio_base + BESLUMACTL);
+	writel( card->regs.bespitch,    card->mmio_base + BESPITCH);
 
 	writel( card->regs.besa1org,    card->mmio_base + BESA1ORG);
 	writel( card->regs.besa1corg,   card->mmio_base + BESA1CORG);
@@ -622,7 +622,7 @@ if(!restore){
 	writel( card->regs.besb1corg,   card->mmio_base + BESB1CORG);
 	writel( card->regs.besb2org,    card->mmio_base + BESB2ORG);
 	writel( card->regs.besb2corg,   card->mmio_base + BESB2CORG);
-	if(card->is_g400) 
+	if(card->is_g400)
 	{
 		writel( card->regs.besa1c3org,  card->mmio_base + BESA1C3ORG);
 		writel( card->regs.besa2c3org,  card->mmio_base + BESA2C3ORG);
@@ -635,7 +635,7 @@ if(!restore){
 	writel( card->regs.beshsrcst,   card->mmio_base + BESHSRCST);
 	writel( card->regs.beshsrcend,  card->mmio_base + BESHSRCEND);
 	writel( card->regs.beshsrclst,  card->mmio_base + BESHSRCLST);
-	
+
 	writel( card->regs.besvcoord,   card->mmio_base + BESVCOORD);
 	writel( card->regs.besviscal,   card->mmio_base + BESVISCAL);
 
@@ -643,7 +643,7 @@ if(!restore){
 	writel( card->regs.besv1wght,   card->mmio_base + BESV1WGHT);
 	writel( card->regs.besv2srclst, card->mmio_base + BESV2SRCLST);
 	writel( card->regs.besv2wght,   card->mmio_base + BESV2WGHT);
-	
+
 	//update the registers somewhere between 1 and 2 frames from now.
 	writel( card->regs.besglobctl + ((readl(card->mmio_base + VCOUNT)+2)<<16),
 			card->mmio_base + BESGLOBCTL);
@@ -682,7 +682,7 @@ if(!restore){
 
 #ifdef MP_DEBUG
 	printk("c2offset = %d\n",card->cregs.c2offset);
-#endif	
+#endif
 
 	writel(card->cregs.c2offset, card->mmio_base + C2OFFSET);
 	writel(card->cregs.c2startadd0, card->mmio_base + C2STARTADD0);
@@ -699,7 +699,7 @@ if(!restore){
 //	writel(card->cregs.c2ctl,	card->mmio_base + C2CTL);
 //	printk("c2ctl:0x%08x c2datactl:0x%08x\n",readl(card->mmio_base + C2CTL),readl(card->mmio_base + C2DATACTL));
 //	printk("c2misc:0x%08x\n", readl(card->mmio_base + C2MISC));
-#endif	
+#endif
 }
 
 static int mga_vid_set_config(mga_card_t * card)
@@ -725,7 +725,7 @@ static int mga_vid_set_config(mga_card_t
 	unsigned int vsyncstart = vdispend + lower_margin;
 	unsigned int vsyncend = vsyncstart + vsync_len;
 	unsigned int vtotal = vsyncend + upper_margin;
-#endif 
+#endif
 	x = config->x_org;
 	y = config->y_org;
 	sw = config->src_width;
@@ -736,7 +736,7 @@ static int mga_vid_set_config(mga_card_t
 #ifdef MP_DEBUG
 	printk(KERN_DEBUG "mga_vid: Setting up a %dx%d+%d+%d video window (src %dx%d) format %X\n",
 	       dw, dh, x, y, sw, sh, config->format);
-#endif	
+#endif
 
 	if(sw<4 || sh<4 || dw<4 || dh<4){
 	    printk(KERN_ERR "mga_vid: Invalid src/dest dimenstions\n");
@@ -744,15 +744,15 @@ static int mga_vid_set_config(mga_card_t
 	}
 
 	//FIXME check that window is valid and inside desktop
-	
-	//Setup the BES registers for a three plane 4:2:0 video source 
+
+	//Setup the BES registers for a three plane 4:2:0 video source
 
 	card->regs.besglobctl = 0;
 
 switch(config->format){
-    case MGA_VID_FORMAT_YV12:	
-    case MGA_VID_FORMAT_I420:	
-    case MGA_VID_FORMAT_IYUV:	
+    case MGA_VID_FORMAT_YV12:
+    case MGA_VID_FORMAT_I420:
+    case MGA_VID_FORMAT_IYUV:
 	card->regs.besctl = 1   // BES enabled
                     + (0<<6)    // even start polarity
                     + (1<<10)   // x filtering enabled
@@ -764,7 +764,7 @@ switch(config->format){
 	if(card->is_g400)
 	{
 		//zoom disabled, zoom filter disabled, 420 3 plane format, proc amp
-		//disabled, rgb mode disabled 
+		//disabled, rgb mode disabled
 		card->regs.besglobctl = (1<<5);
 	}
 	else
@@ -776,7 +776,7 @@ switch(config->format){
 #endif
         break;
 
-    case MGA_VID_FORMAT_YUY2:	
+    case MGA_VID_FORMAT_YUY2:
 	card->regs.besctl = 1   // BES enabled
                     + (0<<6)    // even start polarity
                     + (1<<10)   // x filtering enabled
@@ -788,7 +788,7 @@ switch(config->format){
 	card->regs.besglobctl = 0;        // YUY2 format selected
         break;
 
-    case MGA_VID_FORMAT_UYVY:	
+    case MGA_VID_FORMAT_UYVY:
 	card->regs.besctl = 1   // BES enabled
                     + (0<<6)    // even start polarity
                     + (1<<10)   // x filtering enabled
@@ -805,12 +805,12 @@ switch(config->format){
 	return -1;
 }
 
-	// setting black&white mode 
-	card->regs.besctl|=(card->regs.blackie<<20); 
+	// setting black&white mode
+	card->regs.besctl|=(card->regs.blackie<<20);
 
 	//Enable contrast and brightness control
 	card->regs.besglobctl |= (1<<5) + (1<<7);
-	
+
 	// brightness (-128..127) && contrast (0..255)
 	card->regs.beslumactl = (card->brightness << 16) | ((card->contrast+0x80)&0xFFFF);
 
@@ -819,19 +819,19 @@ switch(config->format){
 	bestop = y > 0 ? y : 0;
 	card->regs.beshcoord = (besleft<<16) + (x + dw-1);
 	card->regs.besvcoord = (bestop<<16) + (y + dh-1);
-	
+
 	//Setup source dimensions
 	card->regs.beshsrclst  = (sw - 1) << 16;
-	card->regs.bespitch = (sw + 31) & ~31 ; 
-	
+	card->regs.bespitch = (sw + 31) & ~31 ;
+
 	//Setup horizontal scaling
 	ifactor = ((sw-1)<<14)/(dw-1);
 	ofsleft = besleft - x;
-		
+
 	card->regs.beshiscal = ifactor<<2;
 	card->regs.beshsrcst = (ofsleft*ifactor)<<2;
 	card->regs.beshsrcend = card->regs.beshsrcst + (((dw - ofsleft - 1) * ifactor) << 2);
-	
+
 	//Setup vertical scaling
 	ifactor = ((sh-1)<<14)/(dh-1);
 	ofstop = bestop - y;
@@ -850,9 +850,9 @@ if(config->format==MGA_VID_FORMAT_YV12
  ||config->format==MGA_VID_FORMAT_I420
  ){
         // planar YUV frames:
-	if (card->is_g400) 
+	if (card->is_g400)
 		baseadrofs = ( ( (ofstop * card->regs.besviscal ) / 4 ) >> 16 ) * card->regs.bespitch;
-	else 
+	else
 		baseadrofs = ( ( ( ofstop * card->regs.besviscal ) / 2 ) >> 16 ) * card->regs.bespitch;
 
     if(config->format==MGA_VID_FORMAT_YV12 || !card->is_g400){
@@ -887,9 +887,9 @@ if(config->format==MGA_VID_FORMAT_YV12
 
 
 switch(config->format){
-    case MGA_VID_FORMAT_YV12:	
-    case MGA_VID_FORMAT_I420:	
-    case MGA_VID_FORMAT_IYUV:	
+    case MGA_VID_FORMAT_YV12:
+    case MGA_VID_FORMAT_I420:
+    case MGA_VID_FORMAT_IYUV:
 	card->cregs.c2ctl = 1   // CRTC2 enabled
 		    + (1<<1)	// external clock
 		    + (0<<2)	// external clock
@@ -945,7 +945,7 @@ switch(config->format){
 */		    ;
         break;
 
-    case MGA_VID_FORMAT_YUY2:	
+    case MGA_VID_FORMAT_YUY2:
 	card->cregs.c2ctl = 1   // CRTC2 enabled
 		    + (1<<1)	// external clock
 		    + (0<<2)	// external clock
@@ -1003,7 +1003,7 @@ switch(config->format){
 */			;
           break;
 
-    case MGA_VID_FORMAT_UYVY:	
+    case MGA_VID_FORMAT_UYVY:
 	card->cregs.c2ctl = 1   // CRTC2 enabled
 		    + (1<<1)	// external clock
 		    + (0<<2)	// external clock
@@ -1066,7 +1066,7 @@ switch(config->format){
 
 	card->cregs.c2hparam = ( (hdispend - 8) << 16) | (htotal - 8);
 	card->cregs.c2hsync = ( (hsyncend - 8) << 16) | (hsyncstart - 8);
-	
+
 	card->cregs.c2misc=0	// CRTCV2 656 togg f0
 		    +(0<<1) // CRTCV2 656 togg f0
 		    +(0<<2) // CRTCV2 656 togg f0
@@ -1083,21 +1083,21 @@ switch(config->format){
 //	card->cregs.c2pl2startadd1=card->regs.besa2corg;
 	card->cregs.c2pl3startadd0=card->regs.besa1c3org;
 //	card->cregs.c2pl3startadd1=card->regs.besa2c3org;
-		    
-	card->cregs.c2preload=(vsyncstart << 16) | (hsyncstart); // from 
-	
+
+	card->cregs.c2preload=(vsyncstart << 16) | (hsyncstart); // from
+
 	card->cregs.c2spicstartadd0=0; // not used
 //	card->cregs.c2spicstartadd1=0; // not used
-	
+
 	card->cregs.c2startadd0=card->regs.besa1org;
 //	card->cregs.c2startadd1=card->regs.besa2org;
-	
+
 	card->cregs.c2subpiclut=0; //not used
-	
+
 	card->cregs.c2vparam = ( (vdispend - 1) << 16) | (vtotal - 1);
 	card->cregs.c2vsync = ( (vsyncend - 1) << 16) | (vsyncstart - 1);
 
-	
+
 #endif
 
 	mga_vid_write_regs(card, 0);
@@ -1113,11 +1113,11 @@ static void enable_irq(mga_card_t * card
 //	printk(KERN_ALERT "*** !!! IRQREG = %d\n", (int)(cc&0xff));
 
 	writeb(0x11, card->mmio_base + CRTCX);
-	
+
 	writeb(0x20, card->mmio_base + CRTCD);  /* clear 0, enable off */
 	writeb(0x00, card->mmio_base + CRTCD);  /* enable on */
 	writeb(0x10, card->mmio_base + CRTCD);  /* clear = 1 */
-	
+
 	writel(card->regs.besglobctl , card->mmio_base + BESGLOBCTL);
 
 }
@@ -1144,21 +1144,21 @@ static void mga_handle_irq(int irq, void
 		cc = readl(card->mmio_base + STATUS);
 		if ( ! (cc & 0x10) ) return;  /* vsyncpen */
 // 		debug_irqcnt++;
-	} 
+	}
 
 //    if ( debug_irqignore ) {
 //	debug_irqignore = 0;
 
 //	frame=(frame+1)&1;
 	card->regs.besctl = (card->regs.besctl & ~0x07000000) + (card->next_frame << 25);
-	writel( card->regs.besctl, card->mmio_base + BESCTL ); 
+	writel( card->regs.besctl, card->mmio_base + BESCTL );
 
 #ifdef CRTC2
-// sem pridat vyber obrazku !!!!	
+// sem pridat vyber obrazku !!!!
 // i han echt kei ahnig was das obe heisse söll
 	crtc2_frame_sel(card->next_frame);
 #endif
-	
+
 #if 0
 	++counter;
 	if(!(counter&63)){
@@ -1191,7 +1191,7 @@ static int mga_vid_ioctl(struct inode *i
 	uint32_t tmp;
 	mga_card_t * card = (mga_card_t *) file->private_data;
 
-	switch(cmd) 
+	switch(cmd)
 	{
 		case MGA_VID_GET_VERSION:
 			tmp = MGA_VID_VERSION;
@@ -1210,7 +1210,7 @@ static int mga_vid_ioctl(struct inode *i
 			//FIXME remove
 
 			printk(KERN_DEBUG "mga_vid: Received configuration\n");
-#endif			
+#endif
 
  			if(copy_from_user(&card->config,(mga_vid_config_t*) arg,sizeof(mga_vid_config_t)))
 			{
@@ -1231,7 +1231,7 @@ static int mga_vid_ioctl(struct inode *i
 				printk(KERN_ERR "mga_vid: illegal num_frames: %d\n",card->config.num_frames);
 				return -EFAULT;
 			}
-			
+
 			card->src_base = (card->ram_size * 0x100000 - card->config.num_frames * card->config.frame_size - card->top_reserved);
 			if(card->src_base<0){
 				printk(KERN_ERR "mga_vid: not enough memory for frames!\n");
@@ -1240,13 +1240,13 @@ static int mga_vid_ioctl(struct inode *i
 			card->src_base &= (~0xFFFF); // 64k boundary
 #ifdef MP_DEBUG
 			printk(KERN_DEBUG "mga YUV buffer base: 0x%X\n", card->src_base);
-#endif			
-			
-			if (card->is_g400) 
+#endif
+
+			if (card->is_g400)
 			  card->config.card_type = MGA_G400;
 			else
 			  card->config.card_type = MGA_G200;
-		       
+
 			card->config.ram_size = card->ram_size;
 
 			if (copy_to_user((mga_vid_config_t *) arg, &card->config, sizeof(mga_vid_config_t)))
@@ -1255,7 +1255,7 @@ static int mga_vid_ioctl(struct inode *i
 				return -EFAULT;
 			}
 
-			result = mga_vid_set_config(card);	
+			result = mga_vid_set_config(card);
 			if(!result) card->configured=1;
 			return result;
 		break;
@@ -1263,7 +1263,7 @@ static int mga_vid_ioctl(struct inode *i
 		case MGA_VID_ON:
 #ifdef MP_DEBUG
 			printk(KERN_DEBUG "mga_vid: Video ON\n");
-#endif			
+#endif
 			card->vid_src_ready = 1;
 			if(card->vid_overlay_on)
 			{
@@ -1279,8 +1279,8 @@ static int mga_vid_ioctl(struct inode *i
 		case MGA_VID_OFF:
 #ifdef MP_DEBUG
 			printk(KERN_DEBUG "mga_vid: Video OFF (ioctl)\n");
-#endif			
-			card->vid_src_ready = 0;   
+#endif
+			card->vid_src_ready = 0;
 #ifdef MGA_ALLOW_IRQ
 			if ( card->irq != -1 ) disable_irq(card);
 #endif
@@ -1288,7 +1288,7 @@ static int mga_vid_ioctl(struct inode *i
                         card->regs.besglobctl &= ~(1<<6);  // UYVY format selected
 			mga_vid_write_regs(card, 0);
 		break;
-			
+
 		case MGA_VID_FSEL:
 			if(copy_from_user(&frame,(int *) arg,sizeof(int)))
 			{
@@ -1311,7 +1311,7 @@ static int mga_vid_ioctl(struct inode *i
 				return -EFAULT;
 			}
 		break;
-			
+
 		case MGA_VID_SET_LUMA:
 			tmp = arg;
 			card->brightness=tmp>>16; card->contrast=tmp&0xFFFF;
@@ -1319,12 +1319,12 @@ static int mga_vid_ioctl(struct inode *i
 			card->regs.beslumactl = (card->brightness << 16) | ((card->contrast+0x80)&0xFFFF);
 			mga_vid_write_regs(card, 0);
 		break;
-			
+
 	        default:
 			printk(KERN_ERR "mga_vid: Invalid ioctl\n");
 			return -EINVAL;
 	}
-       
+
 	return 0;
 }
 
@@ -1349,15 +1349,15 @@ static int mga_vid_find_card(void)
 		}
 
 		card = kmalloc(sizeof(mga_card_t), GFP_KERNEL);
-		if(!card) 
-		{ 
+		if(!card)
+		{
 			printk(KERN_ERR "mga_vid: memory allocation failed\n");
 			mga_cards_num--;
 			break;
 		}
-		
+
 		mga_cards[mga_cards_num - 1] = card;
-		
+
 		switch(dev->device) {
 		case PCI_DEVICE_ID_MATROX_G550:
 			mga_dev_name = "MGA G550";
@@ -1385,14 +1385,14 @@ static int mga_vid_find_card(void)
 			break;
 		}
 	}
- 	
+
 	if(!mga_cards_num)
 	{
 		printk(KERN_ERR "mga_vid: No supported cards found\n");
 	} else {
 		printk(KERN_INFO "mga_vid: %d supported cards found\n", mga_cards_num);
 	}
-	
+
 	return mga_cards_num;
 }
 
@@ -1419,7 +1419,7 @@ static ssize_t mga_vid_read(struct file 
 {
 	uint32_t size;
 	mga_card_t * card = (mga_card_t *) file->private_data;
-	
+
 	if(!card->param_buff) return -ESPIPE;
 	if(!(*ppos)) mga_param_buff_fill(card);
 	if(*ppos >= card->param_buff_len) return 0;
@@ -1437,18 +1437,18 @@ static ssize_t mga_vid_write(struct file
 	{
 		short brightness;
 		brightness=simple_strtol(&buf[strlen(PARAM_BRIGHTNESS)],NULL,10);
-		if (brightness>127 || brightness<-128) { brightness=0;} 
+		if (brightness>127 || brightness<-128) { brightness=0;}
 //		printk(KERN_DEBUG "mga_vid: brightness modified ( %d ) \n",brightness);
 		card->brightness=brightness;
-	} else 
+	} else
 	if(memcmp(buf,PARAM_CONTRAST,min(count,strlen(PARAM_CONTRAST))) == 0)
 	{
 		short contrast;
 		contrast=simple_strtol(&buf[strlen(PARAM_CONTRAST)],NULL,10);
-		if (contrast>127 || contrast<-128) { contrast=0;} 
+		if (contrast>127 || contrast<-128) { contrast=0;}
 //		printk(KERN_DEBUG "mga_vid: contrast modified ( %d ) \n",contrast);
 		card->contrast=contrast;
-	} else 
+	} else
 
         if(memcmp(buf,PARAM_BLACKIE,min(count,strlen(PARAM_BLACKIE))) == 0)
 	{
@@ -1467,7 +1467,7 @@ static int mga_vid_mmap(struct file *fil
 
 #ifdef MP_DEBUG
 	printk(KERN_DEBUG "mga_vid: mapping video memory into userspace\n");
-#endif	
+#endif
 
 	if(!card->configured)
 	{
@@ -1476,7 +1476,7 @@ static int mga_vid_mmap(struct file *fil
 	}
 
 	if(remap_page_range(vma->vm_start, card->mem_base + card->src_base,
-		 vma->vm_end - vma->vm_start, vma->vm_page_prot)) 
+		 vma->vm_end - vma->vm_start, vma->vm_page_prot))
 	{
 		printk(KERN_ERR "mga_vid: error mapping video memory\n");
 		return -EAGAIN;
@@ -1492,11 +1492,11 @@ static int mga_vid_release(struct inode 
 	//Close the window just in case
 #ifdef MP_DEBUG
 	printk(KERN_DEBUG "mga_vid: Video OFF (release)\n");
-#endif	
+#endif
 
 	card = (mga_card_t *) file->private_data;
 
-	card->vid_src_ready = 0;   
+	card->vid_src_ready = 0;
 	card->regs.besctl &= ~1;
         card->regs.besglobctl &= ~(1<<6);  // UYVY format selected
 //	card->config.colkey_on=0; //!!!
@@ -1510,12 +1510,12 @@ static int mga_vid_release(struct inode 
 static long long mga_vid_lseek(struct file *file, long long offset, int origin)
 {
 	return -ESPIPE;
-}					 
+}
 
 static int mga_vid_open(struct inode *inode, struct file *file)
 {
 	mga_card_t * card;
-	
+
 	int minor = MINOR(inode->i_rdev);
 
 	if(!file->private_data)
@@ -1530,17 +1530,17 @@ static int mga_vid_open(struct inode *in
 		file->private_data = mga_cards[minor];
 #ifdef MP_DEBUG
 		printk(KERN_DEBUG "mga_vid: Not using devfs\n");
-#endif	
+#endif
 	}
 #ifdef MP_DEBUG
 	  else {
 		printk(KERN_DEBUG "mga_vid: Using devfs\n");
 	}
-#endif	
+#endif
 
 	card = (mga_card_t *) file->private_data;
 
-	if(card->vid_in_use == 1) 
+	if(card->vid_in_use == 1)
 		return -EBUSY;
 
 	card->vid_in_use = 1;
@@ -1596,7 +1596,7 @@ static void cards_init(mga_card_t * card
 	card->brightness = mga_brightness[card_number];
 	card->contrast = mga_contrast[card_number];
 	card->top_reserved = mga_top_reserved[card_number];
-	
+
 #if LINUX_VERSION_CODE >= 0x020300
 	card->mmio_base = ioremap_nocache(dev->resource[1].start,0x4000);
 	card->mem_base =  dev->resource[0].start;
@@ -1626,7 +1626,7 @@ static void cards_init(mga_card_t * card
 		    // SDRAM:
 		    case 0x00:
 		    case 0x04:  card->ram_size = 16; break;
-		    case 0x03:  
+		    case 0x03:
 		    case 0x05:  card->ram_size = 32; break;
 		    // SGRAM:
 		    case 0x10:
@@ -1652,7 +1652,7 @@ static void cards_init(mga_card_t * card
 //		    case 0x13:  card->ram_size = 8; break;
 		    default: card->ram_size = 8;
 		}
-	    } 
+	    }
 #if 0
 //	    printk("List resources -----------\n");
 	    for(temp=0;temp<DEVICE_COUNT_RESOURCE;temp++){
@@ -1700,8 +1700,8 @@ static void cards_init(mga_card_t * card
 
 }
 
-/* 
- * Main Initialization Function 
+/*
+ * Main Initialization Function
  */
 
 static int mga_vid_initialize(void)
@@ -1720,7 +1720,7 @@ static int mga_vid_initialize(void)
 			}
 		}
 	}
-	
+
 	if(register_chrdev(major, "mga_vid", &mga_vid_fops))
 	{
 		printk(KERN_ERR "mga_vid: unable to get major: %d\n", major);

Modified: trunk/drivers/mga_vid_test.c
==============================================================================
--- trunk/drivers/mga_vid_test.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/drivers/mga_vid_test.c	Wed May 13 04:58:57 2009	(r29305)
@@ -50,16 +50,16 @@ write_frame_g200(uint8_t *y,uint8_t *cr,
 	dest = mga_vid_base;
 	bespitch = (config.src_width + 31) & ~31;
 
-	for(h=0; h < config.src_height; h++) 
+	for(h=0; h < config.src_height; h++)
 	{
 		memcpy(dest, y, config.src_width);
 		y += config.src_width;
 		dest += bespitch;
 	}
 
-	for(h=0; h < config.src_height/2; h++) 
+	for(h=0; h < config.src_height/2; h++)
 	{
-		for(w=0; w < config.src_width/2; w++) 
+		for(w=0; w < config.src_width/2; w++)
 		{
 			*dest++ = *cb++;
 			*dest++ = *cr++;
@@ -77,21 +77,21 @@ write_frame_g400(uint8_t *y,uint8_t *cr,
 	dest = mga_vid_base;
 	bespitch = (config.src_width + 31) & ~31;
 
-	for(h=0; h < config.src_height; h++) 
+	for(h=0; h < config.src_height; h++)
 	{
 		memcpy(dest, y, config.src_width);
 		y += config.src_width;
 		dest += bespitch;
 	}
 
-	for(h=0; h < config.src_height/2; h++) 
+	for(h=0; h < config.src_height/2; h++)
 	{
 		memcpy(dest, cb, config.src_width/2);
 		cb += config.src_width/2;
 		dest += bespitch/2;
 	}
 
-	for(h=0; h < config.src_height/2; h++) 
+	for(h=0; h < config.src_height/2; h++)
 	{
 		memcpy(dest, cr, config.src_width/2);
 		cr += config.src_width/2;
@@ -120,15 +120,15 @@ draw_cool_pattern(void)
 	}
 
 	i = 0;
-	for (y=0; y<config.src_height/2; y++) 
-		for (x=0; x<config.src_width/2; x++) 
+	for (y=0; y<config.src_height/2; y++)
+		for (x=0; x<config.src_width/2; x++)
 		{
 				cr_image[i++] = x - 128;
 		}
 
 	i = 0;
-	for (y=0; y<config.src_height/2; y++) 
-		for (x=0; x<config.src_width/2; x++) 
+	for (y=0; y<config.src_height/2; y++)
+		for (x=0; x<config.src_width/2; x++)
 		{
 				cb_image[i++] = y - 128;
 		}
@@ -147,22 +147,22 @@ draw_color_blend(void)
 	}
 
 	i = 0;
-	for (y=0; y<config.src_height/2; y++) 
-		for (x=0; x<config.src_width/2; x++) 
+	for (y=0; y<config.src_height/2; y++)
+		for (x=0; x<config.src_width/2; x++)
 		{
 				cr_image[i++] = x - 128;
 		}
 
 	i = 0;
-	for (y=0; y<config.src_height/2; y++) 
-		for (x=0; x<config.src_width/2; x++) 
+	for (y=0; y<config.src_height/2; y++)
+		for (x=0; x<config.src_width/2; x++)
 		{
 				cb_image[i++] = y - 128;
 		}
 }
 
 
-int 
+int
 main(void)
 {
 	int f;
@@ -192,7 +192,7 @@ main(void)
 		perror("Error in config ioctl");
 	}
 
-	if (config.card_type == MGA_G200) 
+	if (config.card_type == MGA_G200)
 	{
 		printf("Testing MGA G200 Backend Scaler with %d MB of RAM\n", config.ram_size);
 	  is_g400 = 0;
@@ -202,7 +202,7 @@ main(void)
 		printf("Testing MGA G400 Backend Scaler with %d MB of RAM\n", config.ram_size);
 	  is_g400 = 1;
 	}
-	
+
 	ioctl(f,MGA_VID_ON,0);
 	mga_vid_base = (uint8_t*)mmap(0,256 * 4096,PROT_WRITE,MAP_SHARED,f,0);
 	printf("mga_vid_base = %8p\n",mga_vid_base);

Modified: trunk/drivers/radeon.h
==============================================================================
--- trunk/drivers/radeon.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/drivers/radeon.h	Wed May 13 04:58:57 2009	(r29305)
@@ -1240,7 +1240,7 @@
 #define	SOFT_RESET_PCLK				0x00000200
 #define	SOFT_RESET_ECP				0x00000400
 #define	SOFT_RESET_DISPENG_XCLK			0x00000800
-						
+
 /* RAGE	THEATER	REGISTERS */
 
 #define DMA_VIPH0_COMMAND			0x0A00

Modified: trunk/drivers/radeon_vid.c
==============================================================================
--- trunk/drivers/radeon_vid.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/drivers/radeon_vid.c	Wed May 13 04:58:57 2009	(r29305)
@@ -67,7 +67,7 @@
 #include "radeon_vid.h"
 #include "radeon.h"
 
-#ifdef CONFIG_MTRR 
+#ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
 
@@ -90,7 +90,7 @@ MODULE_DESCRIPTION("Accelerated YUV BES 
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
-#ifdef CONFIG_MTRR 
+#ifdef CONFIG_MTRR
 MODULE_PARM(mtrr, "i");
 MODULE_PARM_DESC(mtrr, "Tune MTRR (touch=1(default))");
 static int mtrr __initdata = 1;
@@ -193,17 +193,17 @@ typedef struct bes_registers_s
   uint32_t test;
   /* Configurable stuff */
   int double_buff;
-  
+
   int brightness;
   int saturation;
-  
+
   int ckey_on;
   uint32_t graphics_key_clr;
   uint32_t graphics_key_msk;
-  
+
   int deinterlace_on;
   uint32_t deinterlace_pattern;
-  
+
 } bes_registers_t;
 
 typedef struct video_registers_s
@@ -225,7 +225,7 @@ static int IsR200=0;
 #define DECLARE_VREG(name) { name, 0 }
 #endif
 #ifdef DEBUG
-static video_registers_t vregs[] = 
+static video_registers_t vregs[] =
 {
   DECLARE_VREG(VIDEOMUX_CNTL),
   DECLARE_VREG(VIPPAD_MASK),
@@ -323,14 +323,14 @@ static video_registers_t vregs[] = 
 static uint32_t radeon_vid_in_use = 0;
 
 static uint8_t *radeon_mmio_base = 0;
-static uint32_t radeon_mem_base = 0; 
+static uint32_t radeon_mem_base = 0;
 static int32_t radeon_overlay_off = 0;
 static uint32_t radeon_ram_size = 0;
 #define PARAM_BUFF_SIZE 4096
 static uint8_t *radeon_param_buff = NULL;
 static uint32_t radeon_param_buff_size=0;
 static uint32_t radeon_param_buff_len=0; /* real length of buffer */
-static mga_vid_config_t radeon_config; 
+static mga_vid_config_t radeon_config;
 
 static char *fourcc_format_name(int format)
 {
@@ -562,7 +562,7 @@ static void radeon_set_transform(float b
 	CAdjGCr = sat * (OvHueSin * trans[ref].RefGCb + OvHueCos * trans[ref].RefGCr);
 	CAdjBCb = sat * OvHueCos * trans[ref].RefBCb;
 	CAdjBCr = sat * OvHueSin * trans[ref].RefBCb;
-    
+
 #if 0 /* default constants */
         CAdjLuma = 1.16455078125;
 
@@ -582,16 +582,16 @@ static void radeon_set_transform(float b
 	OvBCr = CAdjBCr;
 	OvROff = CAdjOff -
 		OvLuma * Loff - (OvRCb + OvRCr) * Coff;
-	OvGOff = CAdjOff - 
+	OvGOff = CAdjOff -
 		OvLuma * Loff - (OvGCb + OvGCr) * Coff;
-	OvBOff = CAdjOff - 
+	OvBOff = CAdjOff -
 		OvLuma * Loff - (OvBCb + OvBCr) * Coff;
 #if 0 /* default constants */
 	OvROff = -888.5;
 	OvGOff = 545;
 	OvBOff = -1104;
-#endif 
-   
+#endif
+
 	dwOvROff = ((int)(OvROff * 2.0)) & 0x1fff;
 	dwOvGOff = (int)(OvGOff * 2.0) & 0x1fff;
 	dwOvBOff = (int)(OvBOff * 2.0) & 0x1fff;
@@ -627,7 +627,7 @@ static void radeon_set_transform(float b
 
 #ifndef RAGE128
 /* Gamma curve definition */
-typedef struct 
+typedef struct
 {
 	unsigned int gammaReg;
 	unsigned int gammaSlope;
@@ -635,7 +635,7 @@ typedef struct 
 }GAMMA_SETTINGS;
 
 /* Recommended gamma curve parameters */
-GAMMA_SETTINGS r200_def_gamma[18] = 
+GAMMA_SETTINGS r200_def_gamma[18] =
 {
 	{OV0_GAMMA_0_F, 0x100, 0x0000},
 	{OV0_GAMMA_10_1F, 0x100, 0x0020},
@@ -657,7 +657,7 @@ GAMMA_SETTINGS r200_def_gamma[18] = 
 	{OV0_GAMMA_3C0_3FF, 0x100, 0x0700}
 };
 
-GAMMA_SETTINGS r100_def_gamma[6] = 
+GAMMA_SETTINGS r100_def_gamma[6] =
 {
 	{OV0_GAMMA_0_F, 0x100, 0x0000},
 	{OV0_GAMMA_10_1F, 0x100, 0x0020},
@@ -864,7 +864,7 @@ RTRACE(RVID_MSG"usr_config: version = %x
 	/* 4:1:0 */
 	case IMGFMT_IF09:
         case IMGFMT_YVU9:
-	/* 4:2:0 */	
+	/* 4:2:0 */
 	case IMGFMT_IYUV:
 	case IMGFMT_YV12:
 	case IMGFMT_I420:
@@ -1089,7 +1089,7 @@ static int radeon_vid_ioctl(struct inode
 						 radeon_config.colkey_red,
 						 radeon_config.colkey_green,
 						 radeon_config.colkey_blue);
-			if(swap_fourcc) radeon_config.format = swab32(radeon_config.format); 
+			if(swap_fourcc) radeon_config.format = swab32(radeon_config.format);
 			printk(RVID_MSG"configuring for '%s' fourcc\n",fourcc_format_name(radeon_config.format));
 			return radeon_vid_init_video(&radeon_config);
 		break;
@@ -1235,9 +1235,9 @@ static int __init radeon_vid_config_card
 	radeon_ram_size /= 0x100000;
 	detected_chip = i;
 	printk(RVID_MSG"Found %s (%uMb memory)\n",ati_card_ids[i].name,radeon_ram_size);
-#ifndef RAGE128	
-	if(ati_card_ids[i].id == PCI_DEVICE_ID_R200_QL || 
-	   ati_card_ids[i].id == PCI_DEVICE_ID_R200_BB || 
+#ifndef RAGE128
+	if(ati_card_ids[i].id == PCI_DEVICE_ID_R200_QL ||
+	   ati_card_ids[i].id == PCI_DEVICE_ID_R200_BB ||
 	   ati_card_ids[i].id == PCI_DEVICE_ID_RV200_QW) IsR200 = 1;
 #endif
 	return TRUE;
@@ -1323,7 +1323,7 @@ static ssize_t radeon_vid_write(struct f
     {
       long brightness;
       brightness=simple_strtol(&buf[strlen(PARAM_BRIGHTNESS)],NULL,10);
-      if(brightness >= -64 && brightness <= 63) 
+      if(brightness >= -64 && brightness <= 63)
       {
         besr.brightness = brightness;
 	OUTREG(OV0_COLOUR_CNTL, (brightness & 0x7f) |
@@ -1402,7 +1402,7 @@ static int radeon_vid_mmap(struct file *
 
 	RTRACE(RVID_MSG"mapping video memory into userspace\n");
 	if(remap_page_range(vma->vm_start, radeon_mem_base + radeon_overlay_off,
-		 vma->vm_end - vma->vm_start, vma->vm_page_prot)) 
+		 vma->vm_end - vma->vm_start, vma->vm_page_prot))
 	{
 		printk(RVID_MSG"error mapping video memory\n");
 		return -EAGAIN;
@@ -1423,7 +1423,7 @@ static int radeon_vid_release(struct ino
 static long long radeon_vid_lseek(struct file *file, long long offset, int origin)
 {
 	return -ESPIPE;
-}					 
+}
 
 static int radeon_vid_open(struct inode *inode, struct file *file)
 {
@@ -1432,7 +1432,7 @@ static int radeon_vid_open(struct inode 
 	if(minor != 0)
 	 return -ENXIO;
 
-	if(radeon_vid_in_use == 1) 
+	if(radeon_vid_in_use == 1)
 		return -EBUSY;
 
 	radeon_vid_in_use = 1;
@@ -1483,8 +1483,8 @@ static struct file_operations radeon_vid
 };
 #endif
 
-/* 
- * Main Initialization Function 
+/*
+ * Main Initialization Function
  */
 
 static int __init radeon_vid_initialize(void)

Modified: trunk/drivers/tdfx_vid.c
==============================================================================
--- trunk/drivers/tdfx_vid.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/drivers/tdfx_vid.c	Wed May 13 04:58:57 2009	(r29305)
@@ -96,7 +96,7 @@ static inline void tdfx_outl(unsigned in
 static inline void banshee_make_room(int size) {
   while((tdfx_inl(STATUS) & 0x1f) < size);
 }
- 
+
 static inline void banshee_wait_idle(void) {
   int i = 0;
 
@@ -116,15 +116,15 @@ static unsigned long get_lfb_size(void) 
   u32 lfbsize   = 0;
   int sgram_p     = 0;
 
-  draminit0 = tdfx_inl(DRAMINIT0);  
+  draminit0 = tdfx_inl(DRAMINIT0);
   draminit1 = tdfx_inl(DRAMINIT1);
 
   if ((pci_dev->device == PCI_DEVICE_ID_3DFX_BANSHEE) ||
       (pci_dev->device == PCI_DEVICE_ID_3DFX_VOODOO3)) {
     sgram_p = (draminit1 & DRAMINIT1_MEM_SDRAM) ? 0 : 1;
-  
+
     lfbsize = sgram_p ?
-      (((draminit0 & DRAMINIT0_SGRAM_NUM)  ? 2 : 1) * 
+      (((draminit0 & DRAMINIT0_SGRAM_NUM)  ? 2 : 1) *
        ((draminit0 & DRAMINIT0_SGRAM_TYPE) ? 8 : 4) * 1024 * 1024) :
       16 * 1024 * 1024;
   } else {
@@ -144,7 +144,7 @@ static unsigned long get_lfb_size(void) 
   miscinit1 |= sgram_p ? 0 : MISCINIT1_2DBLOCK_DIS;
   miscinit1 |= MISCINIT1_CLUT_INV;
 
-  banshee_make_room(1); 
+  banshee_make_room(1);
   tdfx_outl(MISCINIT1, miscinit1);
 #endif
 
@@ -163,7 +163,7 @@ static int tdfx_vid_find_card(void)
   else
     return 0;
 
-  
+
   pci_dev = dev;
 
 #if LINUX_VERSION_CODE >= 0x020300
@@ -181,7 +181,7 @@ static int tdfx_vid_find_card(void)
   printk(KERN_INFO "tdfx_vid: Found %d MB (%d bytes) of memory\n",
 	 tdfx_ram_size / 1024 / 1024,tdfx_ram_size);
 
-  
+
 #if 0
   {
     int temp;
@@ -232,12 +232,12 @@ static int agp_init(void) {
 #endif
   drm_agp->enable(agp_info.mode);
 
-  
+
   printk(KERN_INFO "AGP Enabled\n");
 
   return 1;
 }
-    
+
 static void agp_close(void) {
 
   if(!drm_agp) return;
@@ -247,7 +247,7 @@ static void agp_close(void) {
     drm_agp->free_memory(agp_mem);
     agp_mem = NULL;
   }
-      
+
 
   drm_agp->release();
   inter_module_put("drm_agp");
@@ -306,7 +306,7 @@ static void setup_fifo(u32 offset,ssize_
   tdfx_outl(CMDBASESIZE0,size);
 
   banshee_wait_idle();
-  
+
 }
 #endif
 
@@ -407,7 +407,7 @@ static int tdfx_vid_blit(tdfx_vid_blit_t
   u32 cmin,cmax,srcbase,srcxy,srcfmt,srcsize;
   u32 dstbase,dstxy,dstfmt,dstsize = 0;
   u32 cmd_extra = 0,src_ck[2],dst_ck[2],rop123=0;
-  
+
   //printk(KERN_INFO "tdfx_vid: Make src fmt 0x%x\n",blit->src_format);
   src_fmt = tdfx_vid_make_format(1,blit->src_stride,blit->src_format);
   if(!src_fmt)
@@ -423,10 +423,10 @@ static int tdfx_vid_blit(tdfx_vid_blit_t
   // No stretch : fix me the cmd should be 1 but it
   // doesn't work. Maybe some other regs need to be set
   // as non-stretch blit have more options
-  if(((!blit->dst_w) && (!blit->dst_h)) || 
+  if(((!blit->dst_w) && (!blit->dst_h)) ||
      ((blit->dst_w == blit->src_w) && (blit->dst_h == blit->src_h)))
     cmd = 2;
-  
+
   // Save the regs otherwise fb get crazy
   // we can perhaps avoid some ...
   banshee_wait_idle();
@@ -451,14 +451,14 @@ static int tdfx_vid_blit(tdfx_vid_blit_t
     dst_ck[0] = tdfx_inl(DSTCOLORKEYMIN);
     dst_ck[1] = tdfx_inl(DSTCOLORKEYMAX);
     tdfx_outl(SRCCOLORKEYMIN,blit->dst_colorkey[0]);
-    tdfx_outl(SRCCOLORKEYMAX,blit->dst_colorkey[1]);   
+    tdfx_outl(SRCCOLORKEYMAX,blit->dst_colorkey[1]);
   }
   if(blit->colorkey) {
     cmd_extra = tdfx_inl(COMMANDEXTRA_2D);
     rop123 = tdfx_inl(ROP123);
     tdfx_outl(COMMANDEXTRA_2D, blit->colorkey);
     tdfx_outl(ROP123,(blit->rop[1] | (blit->rop[2] << 8) | blit->rop[3] << 16));
-    
+
   }
   // Get rid of the clipping at the moment
   tdfx_outl(CLIP0MIN,0);
@@ -499,7 +499,7 @@ static int tdfx_vid_blit(tdfx_vid_blit_t
   }
   if(blit->colorkey & TDFX_VID_DST_COLORKEY) {
     tdfx_outl(SRCCOLORKEYMIN,dst_ck[0]);
-    tdfx_outl(SRCCOLORKEYMAX,dst_ck[1]);   
+    tdfx_outl(SRCCOLORKEYMAX,dst_ck[1]);
   }
   if(blit->colorkey) {
     tdfx_outl(COMMANDEXTRA_2D,cmd_extra);
@@ -518,9 +518,9 @@ static int tdfx_vid_set_yuv(unsigned lon
   banshee_make_room(2);
   tdfx_outl(YUVBASEADDRESS,yuv.base & 0x01FFFFFF);
   tdfx_outl(YUVSTRIDE, yuv.stride & 0x3FFF);
-  
+
   banshee_wait_idle();
-  
+
   return 0;
 }
 
@@ -779,7 +779,7 @@ static int tdfx_vid_ioctl(struct inode *
   default:
     printk(KERN_ERR "tdfx_vid: Invalid ioctl %d\n",cmd);
     return -EINVAL;
-  } 
+  }
   return 0;
 }
 
@@ -802,7 +802,7 @@ static void tdfx_vid_mopen(struct vm_are
   unsigned long phys;
 
   printk(KERN_DEBUG "tdfx_vid: mopen\n");
-  
+
   for(i = 0 ; i < agp_mem->page_count ; i++) {
     phys = agp_mem->memory[i] & ~(0x00000fff);
     page = virt_to_page(phys_to_virt(phys));
@@ -836,7 +836,7 @@ static void tdfx_vid_mclose(struct vm_ar
 }
 
 static struct page *tdfx_vid_nopage(struct vm_area_struct *vma,
-				    unsigned long address, 
+				    unsigned long address,
 				    int write_access) {
   unsigned long off;
   uint32_t n;
@@ -883,10 +883,10 @@ static int tdfx_vid_mmap(struct file *fi
     }
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3)
     if(remap_page_range(vma, vma->vm_start,map_start,
-			vma->vm_end - vma->vm_start, vma->vm_page_prot)) 
+			vma->vm_end - vma->vm_start, vma->vm_page_prot))
 #else
     if(remap_page_range(vma->vm_start, (unsigned long)map_start,
-			vma->vm_end - vma->vm_start, vma->vm_page_prot)) 
+			vma->vm_end - vma->vm_start, vma->vm_page_prot))
 #endif
       {
 	printk(KERN_ERR "tdfx_vid: error mapping video memory\n");
@@ -919,10 +919,10 @@ static int tdfx_vid_mmap(struct file *fi
   if(tdfx_map_io) {
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,3)
     if(remap_page_range(vma, vma->vm_start,agp_info.aper_base,
-			vma->vm_end - vma->vm_start, vma->vm_page_prot)) 
+			vma->vm_end - vma->vm_start, vma->vm_page_prot))
 #else
     if(remap_page_range(vma->vm_start, (unsigned long)agp_info.aper_base,
-			vma->vm_end - vma->vm_start, vma->vm_page_prot)) 
+			vma->vm_end - vma->vm_start, vma->vm_page_prot))
 #endif
       {
 	printk(KERN_ERR "tdfx_vid: error mapping video memory\n");
@@ -952,7 +952,7 @@ static int tdfx_vid_release(struct inode
     drm_agp->free_memory(agp_mem);
     agp_mem = NULL;
   }
-  
+
   tdfx_vid_in_use = 0;
 
   MOD_DEC_USE_COUNT;
@@ -962,7 +962,7 @@ static int tdfx_vid_release(struct inode
 static long long tdfx_vid_lseek(struct file *file, long long offset, int origin)
 {
 	return -ESPIPE;
-}					 
+}
 
 static int tdfx_vid_open(struct inode *inode, struct file *file)
 {
@@ -975,7 +975,7 @@ static int tdfx_vid_open(struct inode *i
 	if(minor != 0)
 	 return -ENXIO;
 
-	if(tdfx_vid_in_use == 1) 
+	if(tdfx_vid_in_use == 1)
 		return -EBUSY;
 
 	tdfx_vid_in_use = 1;
@@ -1033,7 +1033,7 @@ int init_module(void)
     return -EINVAL;
   }
 
-  
+
 
   return 0;
 

Modified: trunk/drivers/tdfx_vid.h
==============================================================================
--- trunk/drivers/tdfx_vid.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/drivers/tdfx_vid.h	Wed May 13 04:58:57 2009	(r29305)
@@ -52,7 +52,7 @@
 
 #define TDFX_VID_YUV_STRIDE        (1024)
 #define TDFX_VID_YUV_PLANE_SIZE    (0x0100000)
-                                 
+
 
 typedef struct tdfx_vid_blit_s {
   uint32_t src;

Modified: trunk/drivers/tdfx_vid_test.c
==============================================================================
--- trunk/drivers/tdfx_vid_test.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/drivers/tdfx_vid_test.c	Wed May 13 04:58:57 2009	(r29305)
@@ -38,9 +38,9 @@ static void print_tdfd_vid_cfg(tdfx_vid_
 	    "  Screen: %d x %d\n",
 	    cfg->version,
 	    cfg->ram_size,
-	    cfg->screen_width, cfg->screen_height);	    
+	    cfg->screen_width, cfg->screen_height);
 }
-     
+
 
 int main(void) {
   int fd;
@@ -63,7 +63,7 @@ int main(void) {
     close(fd);
     return 1;
   }
-  
+
   print_tdfd_vid_cfg(&cfg);
 
   mem = mmap( NULL, 640*480*2, PROT_READ | PROT_WRITE, MAP_SHARED,
@@ -79,9 +79,9 @@ int main(void) {
 /*     ptr[1] = (i & 0xFF); */
 /*     ptr += 2; */
 /*   } */
-    
+
   memset(mem,0xFF,640*480*2);
-  
+
   memset(&move, 0, sizeof(tdfx_vid_agp_move_t));
   move.width = 640;
   move.height = 240;
@@ -92,7 +92,7 @@ int main(void) {
     printf("AGP Move failed !!!!\n");
     return 0;
   }
-  
+
   printf("AGP Move ????\n");
   sleep(1);
 
@@ -114,7 +114,7 @@ int main(void) {
     printf("Blit failed !!!!\n");
     return 0;
   }
-  
+
   close(fd);
   return 1;
 }

Modified: trunk/edl.c
==============================================================================
--- trunk/edl.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/edl.c	Wed May 13 04:58:57 2009	(r29305)
@@ -22,12 +22,12 @@ static edl_record_ptr edl_alloc_new(edl_
         mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_EdlOutOfMem);
         exit(1);
     }
-    
+
     if (next_edl_record) // if this isn't the first record, tell the previous one what the new one is.
         next_edl_record->next = new_record;
     new_record->prev = next_edl_record;
     new_record->next = NULL;
-    
+
     return new_record;
 }
 
@@ -81,14 +81,14 @@ edl_record_ptr edl_parse_file(void)
                 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadlyFormattedLine,
                        lineCount);
                 continue;
-            } 
- 
+            }
+
             if (next_edl_record && start <= next_edl_record->stop_sec)
             {
                 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlNOValidLine, line);
                 mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_EdlBadLineOverlap,
                        next_edl_record->stop_sec, start);
-                continue;    
+                continue;
             }
 
             if (stop <= start)
@@ -110,9 +110,9 @@ edl_record_ptr edl_parse_file(void)
                 next_edl_record->length_sec = 0;
                 next_edl_record->start_sec = start;
                 next_edl_record->stop_sec = start;
-                
+
                 next_edl_record = edl_alloc_new(next_edl_record);
-                
+
                 next_edl_record->action = action;
                 next_edl_record->length_sec = 0;
                 next_edl_record->start_sec = stop;
@@ -128,11 +128,11 @@ edl_record_ptr edl_parse_file(void)
         }
 
         fclose(fd);
-    }        
+    }
 
-    if (edl_records) 
+    if (edl_records)
         mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlRecordsNo, record_count);
-    else 
+    else
         mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_EdlQueueEmpty);
 
     return edl_records;

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/etc/codecs.conf	Wed May 13 04:58:57 2009	(r29305)
@@ -2036,7 +2036,7 @@ videocodec kensington
   status working
   fourcc AJPG,ABYR
   fourcc LBYR,JBYR  ; untested, creative labs cam
-  fourcc UV12               ; untested 
+  fourcc UV12               ; untested
   driver vfw
   dll "aoxdxipl.ax"
   out BGR24 flip
@@ -2150,7 +2150,7 @@ videocodec bwmpeg
   fourcc BW10
   driver vfwex
   dll "bw10.dll" ;requires vtaccess.dll
-  out YV12,YUY2,I420  
+  out YV12,YUY2,I420
 
 videocodec zdsoft
   info "zdsoft screen recorder"

Modified: trunk/etc/input.conf
==============================================================================
--- trunk/etc/input.conf	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/etc/input.conf	Wed May 13 04:58:57 2009	(r29305)
@@ -63,8 +63,8 @@ r sub_pos -1            # move subtitles
 t sub_pos +1            #                down
 #? sub_step +1		# immediately display next subtitle
 #? sub_step -1		#                     previous
-#? sub_scale +0.1	# increase subtitle font size 
-#? sub_scale -0.1	# decrease subtitle font size                  
+#? sub_scale +0.1	# increase subtitle font size
+#? sub_scale -0.1	# decrease subtitle font size
 f vo_fullscreen
 T vo_ontop              # toggle video window ontop of other windows
 w panscan -0.1          # zoom out with -panscan 0 -fs

Modified: trunk/etc/menu.conf
==============================================================================
--- trunk/etc/menu.conf	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/etc/menu.conf	Wed May 13 04:58:57 2009	(r29305)
@@ -77,7 +77,7 @@
       <e property="sub" name="Subtitles"/>
       <e property="sub_visibility" name="Visibility"/>
       <e property="sub_forced_only" name="Forced sub only"/>
-      <e property="sub_alignment" name="Alignment"/>   
+      <e property="sub_alignment" name="Alignment"/>
       <e property="sub_pos" name="Position"/>
       <e property="sub_delay" name="Delay"/>
       <e property="sub_scale" name="Scale"/>

Modified: trunk/find_sub.c
==============================================================================
--- trunk/find_sub.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/find_sub.c	Wed May 13 04:58:57 2009	(r29305)
@@ -1,5 +1,5 @@
 //**************************************************************************//
-//             .SUB 
+//             .SUB
 //**************************************************************************//
 
 #include "config.h"
@@ -24,7 +24,7 @@ extern float sub_delay;
 extern float  sub_fps;
 
 void step_sub(sub_data *subd, float pts, int movement) {
-    subtitle *subs; 
+    subtitle *subs;
     int key;
 
     if (subd == NULL) return;
@@ -55,10 +55,10 @@ void step_sub(sub_data *subd, float pts,
 void find_sub(sub_data* subd,int key){
     subtitle *subs;
     int i,j;
-    
+
     if ( !subd || subd->sub_num == 0) return;
     subs = subd->subtitles;
-    
+
     if (last_sub_data != subd) {
         // Sub data changed, reset nosub range.
         last_sub_data = subd;
@@ -80,9 +80,9 @@ void find_sub(sub_data* subd,int key){
       vo_sub=NULL; // no sub here
       return;
     }
-    
+
 //    printf("\r---- sub changed ----\n");
-    
+
     // check next sub.
     if(current_sub>=0 && current_sub+1 < subd->sub_num){
       if(key>subs[current_sub].end && key<subs[current_sub+1].start){
@@ -99,9 +99,9 @@ void find_sub(sub_data* subd,int key){
     }
 
 //    printf("\r---- sub log search... ----\n");
-    
+
     // use logarithmic search:
-    i=0; 
+    i=0;
     j = subd->sub_num - 1;
 //    printf("Searching %d in %d..%d\n",key,subs[i].start,subs[j].end);
     while(j>=i){
@@ -112,7 +112,7 @@ void find_sub(sub_data* subd,int key){
         else return; // found!
     }
 //    if(key>=vo_sub->start && key<=vo_sub->end) return; // OK!
-    
+
     // check where are we...
     if(key<vo_sub->start){
       if(current_sub<=0){
@@ -152,7 +152,7 @@ void find_sub(sub_data* subd,int key){
           return;
       }
     }
-    
+
     mp_msg(MSGT_FIXME,MSGL_FIXME,"SUB ERROR:  %d  ?  %d --- %d  [%d]  \n",key,(int)vo_sub->start,(int)vo_sub->end,current_sub);
 
     vo_sub=NULL; // no sub here

Modified: trunk/gui/app.c
==============================================================================
--- trunk/gui/app.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/app.c	Wed May 13 04:58:57 2009	(r29305)
@@ -72,7 +72,7 @@ static const evName evNames[] =
   { evSetMoviePosition,  "evSetMoviePosition"  },
   { evSetVolume,         "evSetVolume"         },
   { evSetBalance,        "evSetBalance"        },
-  { evHelp,		 "evHelp"	       },	
+  { evHelp,		 "evHelp"	       },
   { evLoadSubtitle,      "evLoadSubtitle"      },
   { evPlayDVD,		 "evPlayDVD"	       },
   { evPlayVCD,		 "evPlayVCD"	       },
@@ -108,7 +108,7 @@ void appClearItem( wItem * item )
  item->tmp=0;
  item->key=0; item->key2=0;
  item->Bitmap.Width=0; item->Bitmap.Height=0; item->Bitmap.BPP=0; item->Bitmap.ImageSize=0;
- if ( item->Bitmap.Image ) free( item->Bitmap.Image ); 
+ if ( item->Bitmap.Image ) free( item->Bitmap.Image );
  item->Bitmap.Image=NULL;
 // ---
  item->fontid=0;
@@ -235,5 +235,5 @@ void btnSet( int event,int set )
     { appMPlayer.Items[j].pressed=set; appMPlayer.barItems[j].tmp=0; }
  for ( j=0;j<appMPlayer.NumberOfBarItems + 1;j++ )
    if ( appMPlayer.barItems[j].msg == event )
-    { appMPlayer.barItems[j].pressed=set; appMPlayer.barItems[j].tmp=0; } 
+    { appMPlayer.barItems[j].pressed=set; appMPlayer.barItems[j].tmp=0; }
 }

Modified: trunk/gui/app.h
==============================================================================
--- trunk/gui/app.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/app.h	Wed May 13 04:58:57 2009	(r29305)
@@ -150,7 +150,7 @@ typedef struct
  char     * label;
 // ---
  int        event;
-// --- 
+// ---
  int        R,G,B;
 } wItem;
 
@@ -166,7 +166,7 @@ typedef struct
  wItem           bar;
  wsTWindow       barWindow;
  int             barIsPresent;
-  
+
  wItem           menuBase;
  wItem           menuSelected;
  wsTWindow       menuWindow;

Modified: trunk/gui/bitmap.c
==============================================================================
--- trunk/gui/bitmap.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/bitmap.c	Wed May 13 04:58:57 2009	(r29305)
@@ -34,9 +34,9 @@ static int pngRead( unsigned char * fnam
  int             len;
  AVCodecContext *avctx;
  AVFrame        *frame;
- 
+
  FILE *fp=fopen( fname,"rb" );
- if ( !fp ) 
+ if ( !fp )
   {
    mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] file read error ( %s )\n",fname );
    return 1;
@@ -108,10 +108,10 @@ static int conv24to32( txSample * bf )
 static void Normalize( txSample * bf )
 {
  int           i;
-#ifndef WORDS_BIGENDIAN 
+#ifndef WORDS_BIGENDIAN
  for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i+3]=0;
 #else
- for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i]=0; 
+ for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i]=0;
 #endif
 }
 
@@ -146,7 +146,7 @@ int bpRead( char * fname, txSample * bf 
 {
  fname=fExist( fname );
  if ( fname == NULL ) return -2;
- if ( pngRead( fname,bf ) ) 
+ if ( pngRead( fname,bf ) )
   {
    mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] unknown file type ( %s )\n",fname );
    return -5;

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/cfg.c	Wed May 13 04:58:57 2009	(r29305)
@@ -106,7 +106,7 @@ static m_config_t * gui_conf;
 static const m_option_t gui_opts[] =
 {
  { "enable_audio_equ",&gtkEnableAudioEqualizer,CONF_TYPE_FLAG,0,0,1,NULL },
- 
+
  { "vo_driver",&video_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
  { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL },
  { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL },
@@ -153,7 +153,7 @@ static const m_option_t gui_opts[] =
 
  { "dvd_device",&dvd_device,CONF_TYPE_STRING,0,0,0,NULL },
  { "cdrom_device",&cdrom_device,CONF_TYPE_STRING,0,0,0,NULL },
- 
+
  { "osd_level",&osd_level,CONF_TYPE_INT,CONF_RANGE,0,3,NULL },
  { "sub_auto_load",&sub_auto,CONF_TYPE_FLAG,0,0,1,NULL },
  { "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL },
@@ -182,14 +182,14 @@ static const m_option_t gui_opts[] =
  { "cache",&gtkCacheOn,CONF_TYPE_FLAG,0,0,1,NULL },
  { "cache_size",&gtkCacheSize,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL },
 
- { "playbar",&gtkEnablePlayBar,CONF_TYPE_FLAG,0,0,1,NULL }, 
+ { "playbar",&gtkEnablePlayBar,CONF_TYPE_FLAG,0,0,1,NULL },
  { "load_fullscreen",&gtkLoadFullscreen,CONF_TYPE_FLAG,0,0,1,NULL },
  { "show_videowin", &gtkShowVideoWindow,CONF_TYPE_FLAG,0,0,1,NULL },
  { "stopxscreensaver",&stop_xscreensaver,CONF_TYPE_FLAG,0,0,1,NULL },
 
  { "autosync",&gtkAutoSyncOn,CONF_TYPE_FLAG,0,0,1,NULL },
  { "autosync_size",&gtkAutoSync,CONF_TYPE_INT,CONF_RANGE,0,10000,NULL },
- 
+
  { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL },
 
  { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG,0,0,1,NULL},
@@ -204,7 +204,7 @@ static const m_option_t gui_opts[] =
  { "equ_channel_4",&gtkEquChannel4,CONF_TYPE_STRING,0,0,0,NULL },
  { "equ_channel_5",&gtkEquChannel5,CONF_TYPE_STRING,0,0,0,NULL },
  { "equ_channel_6",&gtkEquChannel6,CONF_TYPE_STRING,0,0,0,NULL },
- 
+
 #if 1
 #define audio_equ_row( i,j ) { "equ_band_"#i#j,&gtkEquChannels[i][j],CONF_TYPE_FLOAT,CONF_RANGE,-15.0,15.0,NULL },
    audio_equ_row( 0,0 ) audio_equ_row( 0,1 ) audio_equ_row( 0,2 ) audio_equ_row( 0,3 ) audio_equ_row( 0,4 ) audio_equ_row( 0,5 ) audio_equ_row( 0,6 ) audio_equ_row( 0,7 ) audio_equ_row( 0,8 ) audio_equ_row( 0,9 )
@@ -240,7 +240,7 @@ int cfg_read( void )
  mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg );
  gui_conf=m_config_new();
  m_config_register_options( gui_conf,gui_opts );
- if ( !disable_gui_conf && m_config_parse_config_file( gui_conf,cfg ) < 0 ) 
+ if ( !disable_gui_conf && m_config_parse_config_file( gui_conf,cfg ) < 0 )
   {
    mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_ConfigFileError );
 //   exit( 1 );
@@ -305,7 +305,7 @@ int cfg_write( void )
  FILE * f;
  int    i;
 
-// -- save configuration 
+// -- save configuration
  if ( (f=fopen( cfg,"wt+" )) )
   {
    for ( i=0;gui_opts[i].name;i++ )
@@ -323,7 +323,7 @@ int cfg_write( void )
    fclose( f );
   }
  free( cfg );
- 
+
 // -- save playlist
  cfg=get_path( "gui.pl" );
  if ( (f=fopen( cfg,"wt+" )) )
@@ -332,7 +332,7 @@ int cfg_write( void )
    while ( plCurrent )
     {
      if ( plCurrent->path && plCurrent->name )
-      { 
+      {
        fprintf( f,"%s\n",plCurrent->path );
        fprintf( f,"%s\n",plCurrent->name );
       }

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/interface.c	Wed May 13 04:58:57 2009	(r29305)
@@ -82,10 +82,10 @@ char * gstrcat( char ** dest,const char 
  if ( *dest )
   {
    tmp=malloc( strlen( *dest ) + strlen( src ) + 1 );
-   
+
    if ( tmp ) /* TODO: advanced error handling */
     {
-     strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest ); 
+     strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest );
     }
    }
   else
@@ -175,7 +175,7 @@ void greplace(char ***list, const char *
  (*list)[i] = gstrdup(replace);
  (*list)[i + 1] = NULL;
 }
-							    
+
 void guiInit( void )
 {
  int i;
@@ -191,7 +191,7 @@ void guiInit( void )
  if ( stream_cache_size > 0 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; }
  else if ( stream_cache_size == 0 ) gtkCacheOn = 0;
  if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; }
-   
+
 #ifdef CONFIG_ASS
  gtkASS.enabled = ass_enabled;
  gtkASS.use_margins = ass_use_margins;
@@ -200,7 +200,7 @@ void guiInit( void )
 #endif
 
  gtkInit();
-// --- initialize X 
+// --- initialize X
  wsXInit( (void *)mDisplay );
 // --- load skin
  skinDirInHome=get_path("skins");
@@ -245,7 +245,7 @@ void guiInit( void )
     appMPlayer.sub.y=0;
    }
   if (guiWinID>=0) appMPlayer.mainWindow.Parent=guiWinID;
- 
+
  wsCreateWindow( &appMPlayer.subWindow,
   appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height,
   wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsHideWindow,"MPlayer - Video" );
@@ -295,11 +295,11 @@ void guiInit( void )
 
  wsSetIcon( wsDisplay,appMPlayer.mainWindow.WindowID,guiIcon,guiIconMask );
  wsSetIcon( wsDisplay,appMPlayer.subWindow.WindowID,guiIcon,guiIconMask );
- 
+
  guiIntfStruct.Playing=0;
 
  if ( !appMPlayer.mainDecoration ) wsWindowDecoration( &appMPlayer.mainWindow,0 );
- 
+
  wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
 #if 0
  wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
@@ -369,7 +369,7 @@ void guiDone( void )
    gui_main_pos_x=appMPlayer.mainWindow.X; gui_main_pos_y=appMPlayer.mainWindow.Y;
    gui_sub_pos_x=appMPlayer.subWindow.X; gui_sub_pos_y=appMPlayer.subWindow.Y;
   }
- 
+
 #ifdef CONFIG_ASS
  ass_enabled = gtkASS.enabled;
  ass_use_margins = gtkASS.use_margins;
@@ -426,7 +426,7 @@ void guiLoadFont( void )
   {
    vo_font=read_font_desc( font_name,font_factor,0 );
    if ( !vo_font ) mp_msg( MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name );
-  } 
+  }
   else
    {
     font_name=gstrdup( get_path( "font/font.desc" ) );
@@ -479,9 +479,9 @@ void guiLoadSubtitle( char * name )
    mp_msg( MSGT_GPLAYER,MSGL_INFO,MSGTR_LoadingSubtitles,name );
    subdata=sub_read_file( name, guiIntfStruct.FPS );
    if ( !subdata ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_CantLoadSub,name );
-   sub_name = (malloc(2 * sizeof(char*))); //when mplayer will be restarted 
-   sub_name[0] = strdup(name);             //sub_name[0] will be read 
-   sub_name[1] = NULL;  
+   sub_name = (malloc(2 * sizeof(char*))); //when mplayer will be restarted
+   sub_name[0] = strdup(name);             //sub_name[0] will be read
+   sub_name[1] = NULL;
   }
  update_set_of_subtitles();
 
@@ -530,7 +530,7 @@ int guiGetEvent( int type,char * arg )
  stream_t * stream = (stream_t *) arg;
 #ifdef CONFIG_DVDREAD
  dvd_priv_t * dvdp = (dvd_priv_t *) arg;
-#endif 
+#endif
 
  if (guiIntfStruct.mpcontext) {
    audio_out = mpctx_get_audio_out(guiIntfStruct.mpcontext);
@@ -548,7 +548,7 @@ int guiGetEvent( int type,char * arg )
    case guiCEvent:
         switch ( (int)arg )
 	 {
-	  case guiSetPlay: 
+	  case guiSetPlay:
 	       guiIntfStruct.Playing=1;
 //	       if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
 	       break;
@@ -612,15 +612,15 @@ int guiGetEvent( int type,char * arg )
 	switch( stream->type )
 	 {
 #ifdef CONFIG_DVDREAD
-	  case STREAMTYPE_DVD: 
+	  case STREAMTYPE_DVD:
 	       guiGetEvent( guiSetDVD,(char *)stream->priv );
 	       break;
 #endif
 #ifdef CONFIG_VCD
-	  case STREAMTYPE_VCD: 
+	  case STREAMTYPE_VCD:
 	       {
 	        int i;
-		
+
 		if (!stream->priv)
 		{
 		    guiIntfStruct.VCDTracks=0;
@@ -678,10 +678,10 @@ int guiGetEvent( int type,char * arg )
 	 }
 
 	if ( guiIntfStruct.NoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
-	
+
 	if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM ) btnSet( evSetMoviePosition,btnDisabled );
 	 else btnSet( evSetMoviePosition,btnReleased );
-	 
+
 // -- audio
         if ( audio_out )
 	{
@@ -732,14 +732,14 @@ int guiGetEvent( int type,char * arg )
 	  vcd_track=0;
 	  dvd_title=0;
 	  force_fps=0;
-	 }				
+	 }
 	guiIntfStruct.demuxer=NULL;
 	guiIntfStruct.sh_video=NULL;
 	wsPostRedisplay( &appMPlayer.subWindow );
 	break;
    case guiSetParameters:
         guiGetEvent( guiSetDefaults,NULL );
-        switch ( guiIntfStruct.StreamType ) 
+        switch ( guiIntfStruct.StreamType )
          {
 	  case STREAMTYPE_PLAYLIST:
 	       break;
@@ -765,32 +765,32 @@ int guiGetEvent( int type,char * arg )
 #endif
 	 }
 	//if ( guiIntfStruct.StreamType != STREAMTYPE_PLAYLIST ) // Does not make problems anymore!
-	 {	
+	 {
 	  if ( guiIntfStruct.Filename ) filename=gstrdup( guiIntfStruct.Filename );
 	   else if ( filename ) guiSetFilename( guiIntfStruct.Filename,filename );
 	 }
 // --- video opts
-       
+
        if ( !video_driver_list )
 	{
          int i = 0;
            while ( video_out_drivers[i++] )
-	    if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) 
+	    if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
 	     {
 	      gaddlist( &video_driver_list,(char *)video_out_drivers[i - 1]->info->short_name );
 	      break;
 	     }
 	 }
-	
+
 	if ( !video_driver_list && !video_driver_list[0] ) { gtkMessageBox( GTK_MB_FATAL,MSGTR_IDFGCVD ); exit_player( "gui init" ); }
 
 	{
 	 int i = 0;
          guiIntfStruct.NoWindow=False;
          while ( video_out_drivers[i++] )
-	  if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) 
+	  if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
 	   {
-	    if  ( ( video_driver_list && !gstrcmp( video_driver_list[0],(char *)video_out_drivers[i - 1]->info->short_name ) )&&( video_out_drivers[i - 1]->control( VOCTRL_GUI_NOWINDOW,NULL ) == VO_TRUE ) ) 
+	    if  ( ( video_driver_list && !gstrcmp( video_driver_list[0],(char *)video_out_drivers[i - 1]->info->short_name ) )&&( video_out_drivers[i - 1]->control( VOCTRL_GUI_NOWINDOW,NULL ) == VO_TRUE ) )
 	      { guiIntfStruct.NoWindow=True; break; }
 	   }
 	}
@@ -809,10 +809,10 @@ int guiGetEvent( int type,char * arg )
 	   }
 	 }
 #endif
-// ---	 
+// ---
 	if ( gtkVfPP ) add_vf( "pp" );
 	 else remove_vf( "pp" );
-		 
+
 // --- audio opts
 //	if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; }
 	if (gtkAONorm)
@@ -891,14 +891,14 @@ int guiGetEvent( int type,char * arg )
 	gtkSubDumpMPSub=gtkSubDumpSrt=0;
         guiLoadFont();
 
-// --- misc		    
+// --- misc
 	if ( gtkCacheOn ) stream_cache_size=gtkCacheSize;
 	if ( gtkAutoSyncOn ) autosync=gtkAutoSync;
 
         if ( guiIntfStruct.AudioFile ) audio_stream=gstrdup( guiIntfStruct.AudioFile );
 	  else if ( guiIntfStruct.FilenameChanged ) gfree( (void**)&audio_stream );
 	  //audio_stream=NULL;
-	
+
         guiIntfStruct.DiskChanged=0;
         guiIntfStruct.FilenameChanged=0;
         guiIntfStruct.NewPlay=0;
@@ -921,7 +921,7 @@ void guiEventHandling( void )
  gtkEventHandling();
 }
 
-// --- 
+// ---
 
 float gtkEquChannels[6][10];
 
@@ -953,7 +953,7 @@ void * gtkSet( int cmd,float fparam, voi
 {
  equalizer_t * eq = (equalizer_t *)vparam;
  plItem      * item = (plItem *)vparam;
- 
+
  URLItem     * url_item = (URLItem *)vparam;
  int           is_added = True;
 
@@ -988,7 +988,7 @@ void * gtkSet( int cmd,float fparam, voi
 	if ( plCurrent && plCurrent->next)
 	 {
 	  plCurrent=plCurrent->next;
-	  /*if ( !plCurrent && plList ) 
+	  /*if ( !plCurrent && plList )
 	   {
 	    plItem * next = plList;
 	    while ( next->next ) { if ( !next->next ) break; next=next->next; }
@@ -1026,7 +1026,7 @@ void * gtkSet( int cmd,float fparam, voi
 	 // Free it
 	 if ( curr->path ) free( curr->path );
 	 if ( curr->name ) free( curr->name );
-	 free( curr ); 
+	 free( curr );
         }
 	mplCurr(); // Instead of using mplNext && mplPrev
 
@@ -1040,7 +1040,7 @@ void * gtkSet( int cmd,float fparam, voi
 	  {
 	   if ( curr->path ) free( curr->path );
 	   if ( curr->name ) free( curr->name );
-	   free( curr ); 
+	   free( curr );
 	  }
 	  else
 	   {
@@ -1049,7 +1049,7 @@ void * gtkSet( int cmd,float fparam, voi
 	      next=curr->next;
 	      if ( curr->path ) free( curr->path );
 	      if ( curr->name ) free( curr->name );
-	      free( curr ); 
+	      free( curr );
 	      curr=next;
 	     }
 	   }
@@ -1201,7 +1201,7 @@ int import_file_into_gui(char* temp, int
 {
   char *filename, *pathname;
   plItem * item;
-	
+
   filename = strdup(mp_basename(temp));
   pathname = strdup(temp);
   if (strlen(pathname)-strlen(filename)>0)
@@ -1231,10 +1231,10 @@ int import_initial_playtree_into_gui(pla
 {
   play_tree_iter_t* my_pt_iter=NULL;
   int result=0;
-  
+
   if (!enqueue) // Delete playlist before "appending"
     gtkSet(gtkDelPl,0,0);
-  
+
   if((my_pt_iter=pt_iter_create(&my_playtree,config)))
   {
     while ((filename=pt_iter_get_next_file(my_pt_iter))!=NULL)
@@ -1250,7 +1250,7 @@ int import_initial_playtree_into_gui(pla
   if (!enqueue)
     filename=guiIntfStruct.Filename; // Backward compatibility; if file is specified on commandline,
   				     // gmplayer does directly start in Play-Mode.
-  else 
+  else
     filename=NULL;
 
   return result;
@@ -1262,7 +1262,7 @@ int import_initial_playtree_into_gui(pla
 // The file which contained the playlist is thereby replaced with it's contents.
 
 int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config)
-{ 
+{
   play_tree_iter_t* my_pt_iter=NULL;
   int result=0;
   plItem * save=(plItem*)gtkSet( gtkGetCurrPlItem, 0, 0); // Save current item
@@ -1271,23 +1271,23 @@ int import_playtree_playlist_into_gui(pl
   {
     while ((filename=pt_iter_get_next_file(my_pt_iter))!=NULL)
     {
-      if (import_file_into_gui(filename, 1)) // insert it into the list and set plCurrent=new item 
+      if (import_file_into_gui(filename, 1)) // insert it into the list and set plCurrent=new item
         result=1;
     }
     pt_iter_destroy(&my_pt_iter);
   }
 
-  if (save) 
+  if (save)
     gtkSet(gtkSetCurrPlItem, 0, (void*)save);
   else
     gtkSet(gtkSetCurrPlItem, 0, (void*)plList); // go to head, if plList was empty before
 
   if (save && result)
     gtkSet(gtkDelCurrPlItem, 0, 0);
-  
+
   mplCurr();  // Update filename
   filename=NULL;
-  
+
   return result;
 }
 

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/interface.h	Wed May 13 04:58:57 2009	(r29305)
@@ -70,7 +70,7 @@ typedef struct
    guiResizeStruct       resize;
    guiVideoStruct        videodata;
    guiUnknownErrorStruct error;
-   
+
    struct MPContext * mpcontext;
    void * sh_video;
    void * afilter;
@@ -116,10 +116,10 @@ typedef struct
 
    char * Subtitlename;
    int    SubtitleChanged;
-   
+
    char * Othername;
    int    OtherChanged;
-   
+
    char * AudioFile;
    int    AudioFileChanged;
 

Modified: trunk/gui/mplayer/gtk/about.c
==============================================================================
--- trunk/gui/mplayer/gtk/about.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gtk/about.c	Wed May 13 04:58:57 2009	(r29305)
@@ -69,7 +69,7 @@ GtkWidget * create_About( void )
 
   gtk_widget_realize( About );
   gtkAddIcon( About );
-  
+
   vbox=AddVBox( AddDialogFrame( About ),0 );
 
   pixmapstyle=gtk_widget_get_style( About );
@@ -94,8 +94,8 @@ GtkWidget * create_About( void )
   gtk_text_view_set_editable(GTK_TEXT_VIEW(AboutText), FALSE);
   gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(AboutText), FALSE);
   AboutTextBuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (AboutText));
-  gtk_text_buffer_get_iter_at_offset (AboutTextBuffer, &iter, 0);  
-#else  
+  gtk_text_buffer_get_iter_at_offset (AboutTextBuffer, &iter, 0);
+#else
   AboutText=gtk_text_new( NULL,NULL );
   gtk_text_set_editable(GTK_TEXT(AboutText), FALSE);
 #endif
@@ -103,15 +103,15 @@ GtkWidget * create_About( void )
   gtk_widget_show( AboutText );
   gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
 #ifdef CONFIG_GTK2
-  gtk_text_buffer_insert (AboutTextBuffer, &iter,   
-#else  
+  gtk_text_buffer_insert (AboutTextBuffer, &iter,
+#else
   gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
 #endif
-  	"\n" 
-	MSGTR_ABOUT_UHU 
-	"             (http://www.uhulinux.hu/)\n" 
-	"\n" 
-	MSGTR_ABOUT_Contributors 
+  	"\n"
+	MSGTR_ABOUT_UHU
+	"             (http://www.uhulinux.hu/)\n"
+	"\n"
+	MSGTR_ABOUT_Contributors
 	"\n"
 	"     * Ackermann, Andreas\n"
 	"     * adland\n"
@@ -267,8 +267,8 @@ GtkWidget * create_About( void )
 	"     * Zealey, Mark\n"
 	"     * Ziv-Av, Matan\n"
 	"     * Zoltán, Márk Vicián\n"
-	"\n" 
-	MSGTR_ABOUT_Codecs_libs_contributions 
+	"\n"
+	MSGTR_ABOUT_Codecs_libs_contributions
 	"\n"
 	"     * Bellard, Fabrice\n"
 	"     * Chappelier, Vivien and Vincent, Damien\n"
@@ -280,7 +280,7 @@ GtkWidget * create_About( void )
 	"     * Lespinasse, Michel\n"
 	"     * Podlipec, Mark\n"
 	"\n"
-	MSGTR_ABOUT_Translations 
+	MSGTR_ABOUT_Translations
 	"\n"
 	"     * Biernat, Marcin\n"
 	"     * Fargas, Marc\n"
@@ -297,8 +297,8 @@ GtkWidget * create_About( void )
 	"     * Schiller, Wacław\n"
 	"     * Zubimendi, Andoni\n"
 	"\n"
-	MSGTR_ABOUT_Skins 
-	"\n" 
+	MSGTR_ABOUT_Skins
+	"\n"
 	"     * Azrael\n"
 	"     * Bekesi, Viktor\n"
 	"     * Burt.S.\n"

Modified: trunk/gui/mplayer/gtk/eq.c
==============================================================================
--- trunk/gui/mplayer/gtk/eq.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gtk/eq.c	Wed May 13 04:58:57 2009	(r29305)
@@ -91,7 +91,7 @@ static void eqSetBands( int channel )
    get_video_colors( guiIntfStruct.sh_video,"hue",&vo_gamma_hue );
    get_video_colors( guiIntfStruct.sh_video,"saturation",&vo_gamma_saturation );
   }
-										    
+
  gtk_adjustment_set_value( VContrastadj,(float)vo_gamma_contrast );
  gtk_adjustment_set_value( VBrightnessadj,(float)vo_gamma_brightness );
  gtk_adjustment_set_value( VHueadj,(float)vo_gamma_hue );
@@ -177,7 +177,7 @@ void HideEqualizer( void )
 static gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion  * event,gpointer user_data )
 {
  equalizer_t eq;
- switch ( (int)user_data ) 
+ switch ( (int)user_data )
   {
    case 0: eq.gain=A3125adj->value; break;
    case 1: eq.gain=A6250adj->value; break;
@@ -193,13 +193,13 @@ static gboolean eqHScaleMotion( GtkWidge
   }
  eq.gain=0.0f - eq.gain;
  eq.band=(int)user_data;
- if ( Channel == -1 ) 
+ if ( Channel == -1 )
   {
    int i;
    for ( i=0;i<6;i++ )
     { eq.channel=i; gtkSet( gtkSetEqualizer,0,&eq ); }
   } else { eq.channel=Channel; gtkSet( gtkSetEqualizer,0,&eq ); }
-  
+
  return FALSE;
 }
 
@@ -218,16 +218,16 @@ static gboolean eqVScaleMotion( GtkWidge
 }
 
 static void eqButtonReleased( GtkButton * button,gpointer user_data )
-{ 
+{
  switch( (int)user_data )
   {
    case 0: HideEqualizer(); break;
-   case 1: 
+   case 1:
 	if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 )
-	 { 
+	 {
 	  if ( !guiIntfStruct.Playing || !gtkEnableAudioEqualizer ) break;
-	  gtkSet( gtkSetEqualizer,0,NULL ); 
-	  eqSetBands( Channel ); 
+	  gtkSet( gtkSetEqualizer,0,NULL );
+	  eqSetBands( Channel );
 	 }
 	 else
 	  {
@@ -324,7 +324,7 @@ GtkWidget * create_Equalizer( void )
   A3125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
   A3125=AddVScaler( A3125adj,NULL,-1 );
     gtk_table_attach( GTK_TABLE( table1 ),A3125,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
-  
+
   A6250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
   A6250=AddVScaler( A6250adj,NULL,-1 );
     gtk_table_attach( GTK_TABLE( table1 ),A6250,1,2,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
@@ -408,7 +408,7 @@ GtkWidget * create_Equalizer( void )
   gtk_widget_set_name( table1,"table1" );
   gtk_widget_show( table1 );
   gtk_container_add( GTK_CONTAINER( Notebook ),table1 );
-  
+
   gtk_table_attach( GTK_TABLE( table1 ),
     AddLabel( MSGTR_EQU_Contrast,NULL ),
     0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
@@ -457,7 +457,7 @@ GtkWidget * create_Equalizer( void )
   Config=AddButton( MSGTR_Config,hbuttonbox1 );
   Clear=AddButton( MSGTR_Clear,hbuttonbox1 );
   Ok=AddButton( MSGTR_Ok,hbuttonbox1 );
-  
+
   gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
   gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
 
@@ -481,7 +481,7 @@ GtkWidget * create_Equalizer( void )
   gtk_signal_connect( GTK_OBJECT( VBrightness ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)2 );
   gtk_signal_connect( GTK_OBJECT( VHue ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)3 );
   gtk_signal_connect( GTK_OBJECT( VSaturation ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void *)4 );
-  
+
   gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)0 );
   gtk_signal_connect( GTK_OBJECT( Clear ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)1 );
   gtk_signal_connect( GTK_OBJECT( Config ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)2 );
@@ -518,14 +518,14 @@ void ShowEquConfig( void )
 
  if ( EquConfig ) gtkActive( EquConfig );
     else EquConfig=create_EquConfig();
-	
+
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right  );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Left );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Right );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Left );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Center );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Bass );
- 
+
  gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel1 ),Items );
  gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel2 ),Items );
  gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel3 ),Items );
@@ -550,7 +550,7 @@ void HideEquConfig( void )
 {
  if ( !EquConfig ) return;
  gtk_widget_hide( EquConfig );
- gtk_widget_destroy( EquConfig ); 
+ gtk_widget_destroy( EquConfig );
  EquConfig=NULL;
 }
 
@@ -634,35 +634,35 @@ GtkWidget * create_EquConfig( void )
 
   CBChannel2=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel2,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel2=GTK_COMBO( CBChannel2 )->entry;
   gtk_widget_set_name( CEChannel2,"CEChannel2" );
   gtk_widget_show( CEChannel2 );
 
   CBChannel3=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel3,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel3=GTK_COMBO( CBChannel3 )->entry;
   gtk_widget_set_name( CEChannel3,"CEChannel3" );
   gtk_widget_show( CEChannel3 );
 
   CBChannel4=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel4,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel4=GTK_COMBO( CBChannel4 )->entry;
   gtk_widget_set_name( CEChannel4,"CEChannel4" );
   gtk_widget_show( CEChannel4 );
 
   CBChannel5=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel5,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel5=GTK_COMBO( CBChannel5 )->entry;
   gtk_widget_set_name( CEChannel5,"CEChannel5" );
   gtk_widget_show( CEChannel5 );
 
   CBChannel6=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel6,1,2,5,6,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel6=GTK_COMBO( CBChannel6 )->entry;
   gtk_widget_set_name( CEChannel6,"CEChannel6" );
   gtk_widget_show( CEChannel6 );
@@ -680,7 +680,7 @@ GtkWidget * create_EquConfig( void )
   gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
 
   gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&EquConfig );
-  
+
   gtk_signal_connect( GTK_OBJECT( ecOk ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)1 );
   gtk_signal_connect( GTK_OBJECT( ecCancel ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)0 );
 

Modified: trunk/gui/mplayer/gtk/gtk_common.c
==============================================================================
--- trunk/gui/mplayer/gtk/gtk_common.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gtk/gtk_common.c	Wed May 13 04:58:57 2009	(r29305)
@@ -71,7 +71,7 @@ GtkWidget * AddVBox( GtkWidget * parent,
  vbox=gtk_vbox_new( FALSE,0 );
  gtk_widget_set_name( vbox,"vbox" );
  gtk_widget_show( vbox );
- if ( parent ) 
+ if ( parent )
   {
    if ( type ) gtk_box_pack_start( GTK_BOX( parent ),vbox,FALSE,FALSE,0 );
     else gtk_container_add( GTK_CONTAINER( parent ),vbox );

Modified: trunk/gui/mplayer/gtk/gtk_url.c
==============================================================================
--- trunk/gui/mplayer/gtk/gtk_url.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gtk/gtk_url.c	Wed May 13 04:58:57 2009	(r29305)
@@ -44,7 +44,7 @@ void ShowURLDialogBox( void )
 {
  if ( URL ) gtkActive( URL );
    else URL=create_URL();
-   
+
  if ( URLList )
   {
    URLItem * item = URLList;
@@ -56,13 +56,13 @@ void ShowURLDialogBox( void )
      item=item->next;
     }
   }
-   
+
  if ( URLComboEntrys )
   {
    gtk_entry_set_text( GTK_ENTRY( URLEntry ),URLComboEntrys->data );
    gtk_combo_set_popdown_strings( GTK_COMBO( URLCombo ),URLComboEntrys );
   }
- 
+
  gtk_widget_show( URL );
 }
 
@@ -75,7 +75,7 @@ void HideURLDialogBox( void )
 }
 
 static void on_Button_pressed( GtkButton * button,gpointer user_data )
-{ 
+{
  URLItem * item;
 
  if ( (int)user_data )
@@ -96,7 +96,7 @@ static void on_Button_pressed( GtkButton
        free( str ); str=tmp;
       }
      URLComboEntrys=g_list_prepend( URLComboEntrys,(gchar *)str );
-     
+
      item=calloc( 1,sizeof( URLItem ) );
      item->url=gstrdup( str );
      gtkSet( gtkAddURLItem,0,(void *)item );
@@ -105,7 +105,7 @@ static void on_Button_pressed( GtkButton
      mplEventHandling( evPlayNetwork,0 );
     }
   }
- HideURLDialogBox(); 
+ HideURLDialogBox();
 }
 
 GtkWidget * create_URL( void )
@@ -128,7 +128,7 @@ GtkWidget * create_URL( void )
  gtk_window_set_position( GTK_WINDOW( URL ),GTK_WIN_POS_CENTER );
  gtk_window_set_policy( GTK_WINDOW( URL ),TRUE,TRUE,FALSE );
  gtk_window_set_wmclass( GTK_WINDOW( URL ),"Network","MPlayer" );
- 
+
  gtk_widget_realize( URL );
  gtkAddIcon( URL );
 
@@ -155,7 +155,7 @@ GtkWidget * create_URL( void )
 
  Ok=AddButton( MSGTR_Ok,hbuttonbox1 );
  Cancel=AddButton( MSGTR_Cancel,hbuttonbox1 );
- 
+
  gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
  gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
 

Modified: trunk/gui/mplayer/gtk/mb.c
==============================================================================
--- trunk/gui/mplayer/gtk/mb.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gtk/mb.c	Wed May 13 04:58:57 2009	(r29305)
@@ -38,9 +38,9 @@ void ShowMessageBox( const char * msg )
 }
 
 static void on_Ok_released( GtkButton * button,gpointer user_data  )
-{ 
- gtk_widget_hide( MessageBox ); 
- gtk_widget_destroy( MessageBox ); 
+{
+ gtk_widget_hide( MessageBox );
+ gtk_widget_destroy( MessageBox );
  MessageBox=NULL;
 }
 
@@ -66,7 +66,7 @@ GtkWidget * create_MessageBox( int type 
  gtk_window_set_modal( GTK_WINDOW( MessageBox ),TRUE );
  gtk_window_set_policy( GTK_WINDOW( MessageBox ),TRUE,TRUE,FALSE );
  gtk_window_set_wmclass( GTK_WINDOW( MessageBox ),"Message","MPlayer" );
- 
+
  gtk_widget_realize( MessageBox );
  gtkAddIcon( MessageBox );
 

Modified: trunk/gui/mplayer/gtk/menu.c
==============================================================================
--- trunk/gui/mplayer/gtk/menu.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gtk/menu.c	Wed May 13 04:58:57 2009	(r29305)
@@ -102,20 +102,20 @@ static GtkWidget * AddMenuCheckItem(GtkW
 
  Item=gtk_check_menu_item_new();
  Label = gtk_label_new (label);
- 
+
  hbox = gtk_hbox_new (FALSE, 8);
  gtk_box_pack_start (GTK_BOX (hbox), Pixmap, FALSE, FALSE, 0);
  gtk_box_pack_start (GTK_BOX (hbox), Label, FALSE, FALSE, 0);
  gtk_container_add (GTK_CONTAINER (Item), hbox);
- 
+
  gtk_menu_append( GTK_MENU( Menu ),Item );
- 
+
  gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(Item),state);
  gtk_signal_connect_object( GTK_OBJECT(Item),"activate",
    GTK_SIGNAL_FUNC(ActivateMenuItem),(gpointer)Number );
  gtk_menu_item_right_justify (GTK_MENU_ITEM (Item));
  gtk_widget_show_all(Item);
-   
+
  return Item;
 }
 GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm,  GtkWidget * SubMenu,const char * label,int Number )
@@ -174,10 +174,10 @@ GtkWidget * AddSubMenu( GtkWidget *windo
  gtk_box_pack_start (GTK_BOX (hbox), Pixmap, FALSE, FALSE, 0);
  gtk_box_pack_start (GTK_BOX (hbox), Label, FALSE, FALSE, 0);
  gtk_container_add (GTK_CONTAINER (SubItem), hbox);
- 
+
  gtk_menu_append( GTK_MENU( Menu ),SubItem );
  gtk_menu_item_set_submenu( GTK_MENU_ITEM( SubItem ),Item );
- 
+
  gtk_widget_show_all( SubItem );
  return Item;
 }
@@ -451,7 +451,7 @@ GtkWidget * create_PopUpMenu( void )
     AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_MENU_PlayDisc,evPlayVCD );
     AddSeparator( VCDSubMenu );
     VCDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, VCDSubMenu,MSGTR_MENU_Titles );
-    if ( guiIntfStruct.VCDTracks ) 
+    if ( guiIntfStruct.VCDTracks )
      {
       char tmp[32]; int i;
       for ( i=0;i < guiIntfStruct.VCDTracks;i++ )
@@ -560,7 +560,7 @@ GtkWidget * create_PopUpMenu( void )
 
     for ( i=0;i < MAX_A_STREAMS;i++ )
      if ( ((demuxer_t *)guiIntfStruct.demuxer)->a_streams[i] ) c++;
-    
+
     if ( c > 1 )
      {
       SubMenu=AddSubMenu( window1, (const char*)empty_xpm, Menu,MSGTR_MENU_AudioTrack );
@@ -576,7 +576,7 @@ GtkWidget * create_PopUpMenu( void )
 
     for ( c=0,i=0;i < MAX_V_STREAMS;i++ )
      if ( ((demuxer_t *)guiIntfStruct.demuxer)->v_streams[i] ) c++;
-    
+
     if ( c > 1 )
      {
       SubMenu=AddSubMenu( window1, (const char*)empty_xpm, Menu,MSGTR_MENU_VideoTrack );
@@ -590,7 +590,7 @@ GtkWidget * create_PopUpMenu( void )
         }
      }
    }
-  
+
   /* cheap subtitle switching for non-DVD streams */
   if ( global_sub_size && guiIntfStruct.StreamType != STREAMTYPE_DVD )
    {
@@ -619,9 +619,9 @@ GtkWidget * create_PopUpMenu( void )
     AddSeparator( Menu );
     if ( !appMPlayer.subWindow.isFullScreen && guiIntfStruct.Playing )
      {
-      if ( ( appMPlayer.subWindow.Width == guiIntfStruct.MovieWidth * 2 )&& 
+      if ( ( appMPlayer.subWindow.Width == guiIntfStruct.MovieWidth * 2 )&&
            ( appMPlayer.subWindow.Height == guiIntfStruct.MovieHeight * 2 ) ) b2=1;
-      else if ( ( appMPlayer.subWindow.Width == guiIntfStruct.MovieWidth / 2 ) && 
+      else if ( ( appMPlayer.subWindow.Width == guiIntfStruct.MovieWidth / 2 ) &&
                 ( appMPlayer.subWindow.Height == guiIntfStruct.MovieHeight / 2 ) ) b_half=1;
       else b1=1;
      } else b1=!appMPlayer.subWindow.isFullScreen;

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gtk/opts.c	Wed May 13 04:58:57 2009	(r29305)
@@ -138,7 +138,7 @@ static GtkWidget     * CBSubEncoding, * 
 #endif
 
 #if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV)
-static struct 
+static struct
 {
  char * name;
  char * comment;
@@ -167,12 +167,12 @@ static struct 
   { "shift-jis",   MSGTR_PREFERENCES_FontEncoding18 },
   { "cp949",       MSGTR_PREFERENCES_FontEncoding19 },
   { "cp874",       MSGTR_PREFERENCES_FontEncoding20 },
-  { NULL,NULL } 
+  { NULL,NULL }
  };
 char * lCEncoding = NULL;
 char * lSEncoding = NULL;
 #endif
-	    
+
 static int    old_audio_driver = 0;
 static char * ao_driver[3];
 static char * vo_driver[3];
@@ -199,7 +199,7 @@ void ShowPreferences( void )
  if ( Preferences ) gtkActive( Preferences );
    else Preferences=create_Preferences();
 
-// -- 1. page 
+// -- 1. page
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ),gtkEnableAudioEqualizer );
 #if 0
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSurround ),gtkAOSurround );
@@ -259,13 +259,13 @@ void ShowPreferences( void )
  {
   int i = 0, c = 0;
   char * tmp[3]; tmp[2]="";
-  old_video_driver=0; 
+  old_video_driver=0;
   if ( CLVDrivers ) gtk_clist_clear( GTK_CLIST( CLVDrivers ) );
   while ( video_out_drivers[i] )
    if ( video_out_drivers[i++]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
-    { 
+    {
      if ( video_driver_list && !gstrcmp( video_driver_list[0],(char *)video_out_drivers[i - 1]->info->short_name ) ) old_video_driver=c; c++;
-     tmp[0]=(char *)video_out_drivers[i - 1]->info->short_name; tmp[1]=(char *)video_out_drivers[i - 1]->info->name; 
+     tmp[0]=(char *)video_out_drivers[i - 1]->info->short_name; tmp[1]=(char *)video_out_drivers[i - 1]->info->name;
      gtk_clist_append( GTK_CLIST( CLVDrivers ),tmp );
     }
   gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 );
@@ -275,7 +275,7 @@ void ShowPreferences( void )
   if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
 #endif
  }
- 
+
   gtk_adjustment_set_value( HSFPSadj,force_fps );
 
 // -- 3. page
@@ -316,7 +316,7 @@ void ShowPreferences( void )
  if ( sub_cp )
   {
    int i;
-   for ( i=0;lEncoding[i].name;i++ ) 
+   for ( i=0;lEncoding[i].name;i++ )
     if ( !gstrcmp( sub_cp,lEncoding[i].name ) ) break;
    if ( lEncoding[i].name ) lSEncoding=lEncoding[i].comment;
    gtk_entry_set_text( GTK_ENTRY( ESubEncoding ),lSEncoding );
@@ -336,7 +336,7 @@ void ShowPreferences( void )
  if ( subtitle_font_encoding )
   {
    int i;
-   for ( i=0;lEncoding[i].name;i++ ) 
+   for ( i=0;lEncoding[i].name;i++ )
     if ( !gstrcmp( subtitle_font_encoding,lEncoding[i].name ) ) break;
    if ( lEncoding[i].name ) lCEncoding=lEncoding[i].comment;
    gtk_entry_set_text( GTK_ENTRY( EFontEncoding ),lCEncoding );
@@ -409,7 +409,7 @@ void ShowPreferences( void )
  gtk_adjustment_set_value( SBCacheadj,(float)gtkCacheSize );
  if ( !gtkCacheOn ) gtk_widget_set_sensitive( SBCache,FALSE );
   else gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBCache ),TRUE );
-  
+
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAutoSync ),0 );
  gtk_adjustment_set_value( SBAutoSyncadj,(float)gtkAutoSync );
  if ( !gtkAutoSyncOn ) gtk_widget_set_sensitive( SBAutoSync,FALSE );
@@ -464,7 +464,7 @@ void ShowPreferences( void )
  gtk_signal_connect( GTK_OBJECT( ESubEncoding ),"changed",GTK_SIGNAL_FUNC( prEntry ),(void *)1 );
 #endif
  gtk_signal_connect( GTK_OBJECT( HSPPQuality ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)10 );
- 
+
  gtk_signal_connect( GTK_OBJECT( CLADrivers ),"select_row",GTK_SIGNAL_FUNC( prCListRow ),(void*)0 );
  gtk_signal_connect( GTK_OBJECT( CLVDrivers ),"select_row",GTK_SIGNAL_FUNC( prCListRow ),(void*)1 );
 
@@ -472,7 +472,7 @@ void ShowPreferences( void )
  gtkSetLayer( Preferences );
  {
   static int visible = 1;
-  if ( visible ) 
+  if ( visible )
    {
     gtkMessageBox( GTK_MB_WARNING,MSGTR_PREFERENCES_Message );
     visible=0;
@@ -494,7 +494,7 @@ void HidePreferences( void )
 
 #if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV)
 static void prEntry( GtkContainer * container,gpointer user_data )
-{	
+{
  const char * comment;
  int    i;
 
@@ -556,7 +556,7 @@ void prButton( GtkButton * button,gpoint
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBFlip ) ) ) flip=1;
 
 	force_fps=HSFPSadj->value;
-	
+
 	// -- 3. page
 	suboverlap_enabled=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubOverlap ) );
 	sub_auto=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) );
@@ -576,7 +576,7 @@ void prButton( GtkButton * button,gpoint
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDIndicator ) ) ) osd_level=1;
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDTandP ) ) ) osd_level=2;
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBOSDTPTT ) ) ) osd_level=3;
-	
+
 
         // --- 4. page
 	guiSetFilename( font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) );
@@ -602,7 +602,7 @@ void prButton( GtkButton * button,gpoint
 	 int i;
 	 const char * tmp = gtk_entry_get_text( GTK_ENTRY( EVFM ) );
          for( i=0;mpcodecs_vd_drivers[i];i++ )
-          if ( !gstrcmp( tmp,(char *)mpcodecs_vd_drivers[i]->info->name ) ) 
+          if ( !gstrcmp( tmp,(char *)mpcodecs_vd_drivers[i]->info->name ) )
 	   { gaddlist( &video_fm_list,(char *)mpcodecs_vd_drivers[i]->info->short_name ); break; }
 	}
 
@@ -615,7 +615,7 @@ void prButton( GtkButton * button,gpoint
 	}
 
 	// --- 6. page
-	gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); 
+	gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) );
 	gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
 	gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) );
 	gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
@@ -625,7 +625,7 @@ void prButton( GtkButton * button,gpoint
 
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBCache ) ) ) { gtkCacheSize=(int)SBCacheadj->value; gtkCacheOn=1; }
 	 else gtkCacheOn=0;
-	
+
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAutoSync ) ) ) { gtkAutoSync=(int)SBAutoSyncadj->value; gtkAutoSyncOn=1; }
 	 else gtkAutoSyncOn=0;
 
@@ -715,14 +715,14 @@ static void prToggled( GtkToggleButton *
  switch ( (int)user_data )
   {
    case 0: // extra stereo coefficient
-	if ( guiIntfStruct.Playing ) 
+	if ( guiIntfStruct.Playing )
 	gtk_widget_set_sensitive( HSExtraStereoMul,gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBExtraStereo ) ) );
 	break;
 //   case 1: // normalize
 //   case 2: // equalizer
 //	if ( guiIntfStruct.Playing ) gtkMessageBox( GTK_MB_WARNING,"Please remember, this function need restart the playing." );
 //	break;
-   case 3: 
+   case 3:
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ) ) gtk_widget_set_sensitive( CBLoadFullscreen,TRUE );
 	 else
 	  {
@@ -774,8 +774,8 @@ static void prCListRow( GtkCList * clist
 {
  switch ( (int)user_data )
   {
-   case 0: // audio driver 
-	gtk_clist_get_text( GTK_CLIST( CLADrivers ),row,0,(char **)&ao_driver ); 
+   case 0: // audio driver
+	gtk_clist_get_text( GTK_CLIST( CLADrivers ),row,0,(char **)&ao_driver );
 	gtk_widget_set_sensitive( AConfig,FALSE );
 	if ( !strncmp( ao_driver[0],"oss",3 ) ||
 	     !strncmp( ao_driver[0],"alsa",4 ) ||
@@ -787,14 +787,14 @@ static void prCListRow( GtkCList * clist
           gtkMessageBox(GTK_MB_WARNING|GTK_MB_SIMPLE, MSGTR_PREFERENCES_ArtsBroken);
 #endif
 	break;
-   case 1: // video driver 
-	gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver ); 
+   case 1: // video driver
+	gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver );
 	gtk_widget_set_sensitive( VConfig,FALSE );
 #ifdef CONFIG_DXR3
 	if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE );
 #endif
 	break;
-  } 
+  }
 }
 
 GtkWidget * create_Preferences( void )
@@ -849,7 +849,7 @@ GtkWidget * create_Preferences( void )
   gtk_window_set_position( GTK_WINDOW( Preferences ),GTK_WIN_POS_CENTER );
 //  gtk_window_set_policy( GTK_WINDOW( Preferences ),FALSE,FALSE,FALSE );
   gtk_window_set_wmclass( GTK_WINDOW( Preferences ),"Preferences","MPlayer" );
-  
+
   gtk_widget_realize( Preferences );
   gtkAddIcon( Preferences );
 
@@ -888,7 +888,7 @@ GtkWidget * create_Preferences( void )
   AConfig=AddButton( MSGTR_ConfigDriver,
     AddHButtonBox( vbox2 ) );
 
-  vbox3=AddVBox( 
+  vbox3=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,0 ),1 ),0 );
     gtk_widget_set_usize( vbox3,250,-2 );
@@ -921,7 +921,7 @@ GtkWidget * create_Preferences( void )
 
   hbox2=AddVBox( notebook1,0 );
 
-  vbox4=AddVBox( 
+  vbox4=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox2,1 ),1 ),0 );
 
@@ -946,7 +946,7 @@ GtkWidget * create_Preferences( void )
   hbuttonbox3=AddHButtonBox( vbox4 );
   VConfig=AddButton( MSGTR_ConfigDriver,hbuttonbox3 );
 
-  vbox5=AddVBox( 
+  vbox5=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox2,0 ),1 ),0 );
     gtk_widget_set_usize( vbox5,250,-2 );
@@ -986,7 +986,7 @@ GtkWidget * create_Preferences( void )
 
   vbox6=AddVBox( notebook1,0 );
 
-  vbox600=AddVBox( 
+  vbox600=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( MSGTR_PREFERENCES_FRAME_OSD_Level,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
 
@@ -995,7 +995,7 @@ GtkWidget * create_Preferences( void )
   RBOSDIndicator=AddRadioButton( MSGTR_PREFERENCES_OSDProgress,&OSD_group,vbox600 );
   RBOSDTPTT=AddRadioButton( MSGTR_PREFERENCES_OSDTimerPercentageTotalTime,&OSD_group,vbox600 );
 
-  vbox7=AddVBox( 
+  vbox7=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( MSGTR_PREFERENCES_FRAME_Subtitle,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 );
 
@@ -1025,7 +1025,7 @@ GtkWidget * create_Preferences( void )
     gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   label=AddLabel( MSGTR_PREFERENCES_SUB_POS,NULL );
-    gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );    
+    gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
 
   label=AddLabel( MSGTR_PREFERENCES_SUB_FPS,NULL );
     gtk_table_attach( GTK_TABLE( table1 ),label,0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
@@ -1103,7 +1103,7 @@ GtkWidget * create_Preferences( void )
 
 // --- 4. page
 
-  vbox603=AddVBox( 
+  vbox603=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( MSGTR_PREFERENCES_FRAME_Font,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
 
@@ -1136,7 +1136,7 @@ GtkWidget * create_Preferences( void )
 
   label=AddLabel( MSGTR_PREFERENCES_FontEncoding,NULL );
     gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CBFontEncoding=gtk_combo_new();
   gtk_widget_set_name( CBFontEncoding,"CBFontEncoding" );
   gtk_widget_show( CBFontEncoding );
@@ -1189,7 +1189,7 @@ GtkWidget * create_Preferences( void )
 
   vbox601=AddVBox( notebook1,0 );
 
-  vbox602=AddVBox( 
+  vbox602=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( MSGTR_PREFERENCES_FRAME_CodecDemuxer,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
 
@@ -1228,10 +1228,10 @@ GtkWidget * create_Preferences( void )
     gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),4 ),label );
 
   vbox601=AddVBox( notebook1,0 );
-  
+
 // --- 6. page
 
-  vbox602=AddVBox( 
+  vbox602=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( MSGTR_PREFERENCES_FRAME_PostProcess,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
 
@@ -1245,12 +1245,12 @@ GtkWidget * create_Preferences( void )
    else HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0,0,0 ) );
   HSPPQuality=AddHScaler( HSPPQualityadj,hbox5,0 );
 
-  vbox602=AddVBox( 
+  vbox602=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( MSGTR_PREFERENCES_FRAME_Cache,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 );
 
   CBCache=AddCheckButton( MSGTR_PREFERENCES_Cache,vbox602 );
-  
+
   hbox5=AddHBox( vbox602,1 );
 
   AddLabel( MSGTR_PREFERENCES_CacheSize,hbox5 );
@@ -1260,7 +1260,7 @@ GtkWidget * create_Preferences( void )
   gtk_widget_show( SBCache );
   gtk_box_pack_start( GTK_BOX( hbox5 ),SBCache,TRUE,TRUE,0 );
 
-  vbox602=AddVBox( 
+  vbox602=AddVBox(
     AddFrame( NULL,GTK_SHADOW_NONE,
       AddFrame( MSGTR_PREFERENCES_FRAME_Misc,GTK_SHADOW_ETCHED_OUT,vbox601,1 ),1 ),0 );
 
@@ -1315,12 +1315,12 @@ GtkWidget * create_Preferences( void )
     gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 );
   BOk=AddButton( MSGTR_Ok,hbuttonbox1 );
   BCancel=AddButton( MSGTR_Cancel,hbuttonbox1 );
-  
+
   gtk_widget_add_accelerator( BOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
   gtk_widget_add_accelerator( BCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
 
   gtk_signal_connect( GTK_OBJECT( Preferences ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&Preferences );
-  
+
   gtk_signal_connect( GTK_OBJECT( AConfig ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void*)bAConfig );
   gtk_signal_connect( GTK_OBJECT( BOk ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void*)bOk );
   gtk_signal_connect( GTK_OBJECT( BCancel ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void*)bCancel );
@@ -1470,7 +1470,7 @@ GList *appendESDDevices(GList *l) {
 }
 #endif
 
-// Gets text string from a gtk entry, interpreting 
+// Gets text string from a gtk entry, interpreting
 // MSGTR_PREFERENCES_DriverDefault as null string.
 const char *getGtkEntryText(GtkWidget *from) {
   const char *tmp = gtk_entry_get_text(GTK_ENTRY(from));
@@ -1480,7 +1480,7 @@ const char *getGtkEntryText(GtkWidget *f
   return tmp;
 }
 
-// Sets text string of a gtk entry, interpreting 
+// Sets text string of a gtk entry, interpreting
 // null string as MSGTR_PREFERENCES_DriverDefault.
 void setGtkEntryText(GtkWidget *dest, char *to) {
   if (!to) {
@@ -1535,7 +1535,7 @@ void ShowAudioConfig( void ) {
 void HideAudioConfig( void ) {
   if (!AudioConfig) return;
   gtk_widget_hide(AudioConfig);
-  gtk_widget_destroy(AudioConfig); 
+  gtk_widget_destroy(AudioConfig);
   AudioConfig=NULL;
 }
 
@@ -1820,7 +1820,7 @@ GtkWidget * create_DXR3Config( void )
  gtk_widget_add_accelerator( dxr3BCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
 
  gtk_signal_connect( GTK_OBJECT( DXR3Config ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&DXR3Config );
- 
+
  gtk_signal_connect( GTK_OBJECT( dxr3BOk ),"clicked",GTK_SIGNAL_FUNC( dxr3Button ),(void *)0 );
  gtk_signal_connect( GTK_OBJECT( dxr3BCancel ),"clicked",GTK_SIGNAL_FUNC( dxr3Button ),(void *)1 );
 

Modified: trunk/gui/mplayer/gtk/pl.c
==============================================================================
--- trunk/gui/mplayer/gtk/pl.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gtk/pl.c	Wed May 13 04:58:57 2009	(r29305)
@@ -153,7 +153,7 @@ void ShowPlayList( void )
      pos=strtok( NULL,"/" );
      gtk_ctree_get_node_info( GTK_CTREE( CTDirTree ),node,NULL,NULL,NULL,NULL,NULL,NULL,&leaf,NULL );
      if ( !leaf && pos ) gtk_ctree_expand( GTK_CTREE( CTDirTree ),node );
-      else 
+      else
        {
         DirNodeType * DirNode;
         gtk_ctree_select( GTK_CTREE( CTDirTree ),node );
@@ -247,7 +247,7 @@ static void plButtonReleased( GtkButton 
 	 }
        }
   case 0: // cancel
-       HidePlayList(); 
+       HidePlayList();
        break;
   case 2: // remove
        {
@@ -258,7 +258,7 @@ static void plButtonReleased( GtkButton 
 
         gtk_clist_freeze( GTK_CLIST( CLSelected ) );
         for ( i=0;i<NrOfSelected-c;i++ )
-  	 if ( CLListSelected[i] ) 
+  	 if ( CLListSelected[i] )
 	  {
 	   gtk_clist_remove( GTK_CLIST( CLSelected ),i - c );
 	   c++;
@@ -341,7 +341,7 @@ static void plCTree( GtkCTree * ctree,Gt
    gtk_clist_freeze( GTK_CLIST( ctree ) );
    node=gtk_ctree_find_by_row_data( ctree,parent_node,NULL );
    gtk_ctree_remove_node( ctree,node );
-			   
+
    if ( (dir=opendir( DirNode->path ) ) )
     {
      while( (dirent=readdir( dir )) )
@@ -363,7 +363,7 @@ static void plCTree( GtkCTree * ctree,Gt
       }
      closedir( dir );
     }
-		    
+
    gtk_ctree_sort_node( ctree,parent_node );
    gtk_clist_thaw( GTK_CLIST( ctree ) );
   }
@@ -443,7 +443,7 @@ GtkWidget * create_PlayList( void )
 
   scrolledwindow1=gtk_scrolled_window_new( NULL,NULL );
   gtk_widget_show( scrolledwindow1 );
-  gtk_container_add( GTK_CONTAINER( 
+  gtk_container_add( GTK_CONTAINER(
     AddFrame( NULL,0,hbox1,1 ) ),scrolledwindow1 );
   gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC );
 
@@ -469,10 +469,10 @@ GtkWidget * create_PlayList( void )
   gtk_ctree_expand( GTK_CTREE( CTDirTree ),parent );
   gtk_widget_show( CTDirTree );
 
-  
+
   gtk_clist_set_column_widget( GTK_CLIST( CTDirTree ),0,
     AddLabel( MSGTR_PLAYLIST_DirectoryTree,NULL ) );
-  
+
   vbox2=AddVBox(
     AddFrame( NULL,1,hbox1,1 ),0 );
 

Modified: trunk/gui/mplayer/gtk/sb.c
==============================================================================
--- trunk/gui/mplayer/gtk/sb.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gtk/sb.c	Wed May 13 04:58:57 2009	(r29305)
@@ -104,7 +104,7 @@ static void prButton( GtkObject * object
 	ChangeSkin( sbSelectedSkin );
 	if ( skinName ) free( skinName );
 	skinName=strdup( sbSelectedSkin );
-	break;   
+	break;
   }
  }
  HideSkinBrowser();

Modified: trunk/gui/mplayer/gui_common.c
==============================================================================
--- trunk/gui/mplayer/gui_common.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/gui_common.c	Wed May 13 04:58:57 2009	(r29305)
@@ -54,7 +54,7 @@ static inline void TranslateFilename( in
 {
  int i;
  char * p;
- 
+
  switch ( guiIntfStruct.StreamType )
   {
    case STREAMTYPE_STREAM:
@@ -214,16 +214,16 @@ void PutImage( txSample * bf,int x,int y
  for ( iy=y;iy < (int)(y+bf->Height / max);iy++ )
   for ( ix=x;ix < (int)(x+bf->Width);ix++ )
    {
-    tmp=drw[i++]; 
+    tmp=drw[i++];
     if ( tmp != 0x00ff00ff ) buf[iy * image_width + ix]=tmp;
    }
 #else
- yc=y * image_width; 
+ yc=y * image_width;
  for ( iy=y;iy < (int)(y+bf->Height / max);iy++ )
   {
    for ( ix=x;ix < (int)(x+bf->Width);ix++ )
     {
-     tmp=drw[i++]; 
+     tmp=drw[i++];
      if ( tmp != 0x00ff00ff ) buf[yc + ix]=tmp;
     }
    yc+=image_width;
@@ -248,7 +248,7 @@ void SimplePotmeterPutImage( txSample * 
  {
   for ( ix=x;ix < (int)(x+w);ix++ )
    {
-    tmp=drw[i++]; 
+    tmp=drw[i++];
     if ( tmp != 0x00ff00ff ) buf[iy * image_width + ix]=tmp;
    }
   i+=r;

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/mw.c	Wed May 13 04:58:57 2009	(r29305)
@@ -73,7 +73,7 @@ void mplMainDraw( void )
 {
 
  if ( appMPlayer.mainWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );
- 
+
  if ( appMPlayer.mainWindow.Visible == wsWindowNotVisible ||
       !mainVisible ) return;
 //      !appMPlayer.mainWindow.Mapped ) return;
@@ -125,7 +125,7 @@ void mplEventHandling( int msg,float par
 	goto play;
 
    case evSetSubtitle:
-        mp_property_do("sub",M_PROPERTY_SET,&iparam,guiIntfStruct.mpcontext); 
+        mp_property_do("sub",M_PROPERTY_SET,&iparam,guiIntfStruct.mpcontext);
 	break;
 
 #ifdef CONFIG_VCD
@@ -192,7 +192,7 @@ play:
 		 guiIntfStruct.Chapter=guiIntfStruct.DVD.current_chapter;
 		 guiIntfStruct.Angle=guiIntfStruct.DVD.current_angle;
                  guiIntfStruct.DiskChanged=1;
-		} 
+		}
                break;
 #endif
          }
@@ -226,9 +226,9 @@ NoPause:
         mplPause();
         break;
 
-   case evStop: 
-	guiIntfStruct.Playing=guiSetStop; 
-	mplState(); 
+   case evStop:
+	guiIntfStruct.Playing=guiSetStop;
+	mplState();
 	guiIntfStruct.NoWindow=False;
 	break;
 
@@ -269,7 +269,7 @@ NoPause:
    case evSetVolume:
         guiIntfStruct.Volume=param;
 	goto set_volume;
-   case evSetBalance: 
+   case evSetBalance:
         guiIntfStruct.Balance=param;
 set_volume:
         {
@@ -358,7 +358,7 @@ set_volume:
 	wsClearWindow( appMPlayer.subWindow );
 #ifdef CONFIG_DVDREAD
 	if ( guiIntfStruct.StreamType == STREAMTYPE_DVD || guiIntfStruct.StreamType == STREAMTYPE_VCD ) goto play_dvd_2;
-	 else 
+	 else
 #endif
 	 guiIntfStruct.NewPlay=1;
 	break;
@@ -424,7 +424,7 @@ void mplMainMouseHandle( int Button,int 
           sx=X; sy=Y; boxMoved=1; itemtype=itPLMButton;
           SelectedItem=currentselected;
           if ( SelectedItem == -1 ) break;
-          boxMoved=0; 
+          boxMoved=0;
           item=&appMPlayer.Items[SelectedItem];
           itemtype=item->type;
           item->pressed=btnPressed;
@@ -517,7 +517,7 @@ void mplMainKeyHandle( int KeyCode,int T
  int msg = evNone;
 
  if ( Type != wsKeyPressed ) return;
- 
+
  if ( !Key )
   {
    switch ( KeyCode )
@@ -544,11 +544,11 @@ void mplMainKeyHandle( int KeyCode,int T
       case wsXF86Prev:         msg=evPrev; break;
       case wsXF86Next:         msg=evNext; break;
       case wsXF86Media:        msg=evLoad; break;
-      case wsEscape: 
+      case wsEscape:
     	    if ( appMPlayer.subWindow.isFullScreen )
-	     { 
-	      if ( guiIntfStruct.event_struct ) ((XEvent *)guiIntfStruct.event_struct)->type=None; 
-	      mplEventHandling( evNormalSize,0 ); 
+	     {
+	      if ( guiIntfStruct.event_struct ) ((XEvent *)guiIntfStruct.event_struct)->type=None;
+	      mplEventHandling( evNormalSize,0 );
 	      return;
 	     }
       default:          vo_x11_putkey( Key ); return;
@@ -580,7 +580,7 @@ void mplDandDHandler(int num,char** file
     if(stat(str,&buf) == 0 && S_ISDIR(buf.st_mode) == 0) {
       /* this is not a directory so try to play it */
       mp_msg( MSGT_GPLAYER,MSGL_V,"Received D&D %s\n",str );
-      
+
       /* check if it is a subtitle file */
       {
 	char* ext = strrchr(str,'.');
@@ -605,7 +605,7 @@ void mplDandDHandler(int num,char** file
       }
 
       item = calloc(1,sizeof(plItem));
-      
+
       /* FIXME: decompose file name ? */
       /* yes -- Pontscho */
       if ( strrchr( str,'/' ) ) {

Modified: trunk/gui/mplayer/pb.c
==============================================================================
--- trunk/gui/mplayer/pb.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/pb.c	Wed May 13 04:58:57 2009	(r29305)
@@ -59,7 +59,7 @@ int		mplPBFade = 0;
 void mplPBDraw( void )
 {
  int x;
- 
+
  if ( !appMPlayer.subWindow.isFullScreen ) return;
  if ( !mplPBVisible || !appMPlayer.barIsPresent ) return;
 
@@ -70,7 +70,7 @@ void mplPBDraw( void )
    case -2: x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ); break;
    default: x=appMPlayer.bar.x;
   }
-	      
+
  switch ( mplPBFade )
   {
    case 1: // fade in
@@ -81,7 +81,7 @@ void mplPBDraw( void )
 	  mplPBFade=0;
 	  vo_mouse_autohide=0;
 	 }
-        wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); 
+        wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength );
 	break;
    case 2: // fade out
 	mplPBLength+=10;
@@ -89,11 +89,11 @@ void mplPBDraw( void )
 	 {
 	  mplPBLength=appMPlayer.subWindow.Height;
 	  mplPBFade=mplPBVisible=0;
-          vo_mouse_autohide=1; 
-          wsVisibleWindow( &appMPlayer.barWindow,wsHideWindow ); 
+          vo_mouse_autohide=1;
+          wsVisibleWindow( &appMPlayer.barWindow,wsHideWindow );
 	  return;
 	 }
-        wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); 
+        wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength );
 	break;
   }
 
@@ -102,12 +102,12 @@ void mplPBDraw( void )
   {
    btnModify( evSetMoviePosition,guiIntfStruct.Position );
    btnModify( evSetVolume,guiIntfStruct.Volume );
-   
+
    vo_mouse_autohide=0;
 
    fast_memcpy( mplPBDrawBuffer,appMPlayer.bar.Bitmap.Image,appMPlayer.bar.Bitmap.ImageSize );
    Render( &appMPlayer.barWindow,appMPlayer.barItems,appMPlayer.NumberOfBarItems,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize );
-   wsConvert( &appMPlayer.barWindow,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize );   
+   wsConvert( &appMPlayer.barWindow,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize );
   }
  wsPutImage( &appMPlayer.barWindow );
 }
@@ -121,7 +121,7 @@ void mplPBMouseHandle( int Button,int X,
         int     i;
         wItem * item = NULL;
 	float   value = 0.0f;
-			 
+
  static int     SelectedItem = -1;
 	int     currentselected = -1;
 
@@ -129,7 +129,7 @@ void mplPBMouseHandle( int Button,int X,
    if ( ( appMPlayer.barItems[i].pressed != btnDisabled )&&
       ( wgIsRect( X,Y,appMPlayer.barItems[i].x,appMPlayer.barItems[i].y,appMPlayer.barItems[i].x+appMPlayer.barItems[i].width,appMPlayer.barItems[i].y+appMPlayer.barItems[i].height ) ) )
     { currentselected=i; break; }
-		    
+
  switch ( Button )
   {
    case wsPMMouseButton:
@@ -230,8 +230,8 @@ void mplPBShow( int x, int y )
  if ( !appMPlayer.barIsPresent || !gtkEnablePlayBar ) return;
  if ( !appMPlayer.subWindow.isFullScreen ) return;
 
- if ( y > appMPlayer.subWindow.Height - appMPlayer.bar.height ) 
-  { 
+ if ( y > appMPlayer.subWindow.Height - appMPlayer.bar.height )
+  {
    if ( !mplPBFade ) wsVisibleWindow( &appMPlayer.barWindow,wsShowWindow );
    mplPBFade=1; mplPBVisible=1; wsPostRedisplay( &appMPlayer.barWindow );
   }
@@ -256,10 +256,10 @@ void mplPBInit( void )
    wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsHideFrame|wsHideWindow,"PlayBar" );
 
  wsSetShape( &appMPlayer.barWindow,appMPlayer.bar.Mask.Image );
- 
+
  appMPlayer.barWindow.ReDraw=(void *)mplPBDraw;
  appMPlayer.barWindow.MouseHandler=mplPBMouseHandle;
  appMPlayer.barWindow.KeyHandler=mplMainKeyHandle;
- 
+
  mplPBLength=appMPlayer.subWindow.Height;
 }

Modified: trunk/gui/mplayer/play.c
==============================================================================
--- trunk/gui/mplayer/play.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/play.c	Wed May 13 04:58:57 2009	(r29305)
@@ -56,8 +56,8 @@ void mplFullScreen( void )
  if ( guiIntfStruct.NoWindow && guiIntfStruct.Playing ) return;
 
   if ( ( guiIntfStruct.Playing )&&( appMPlayer.subWindow.isFullScreen ) )
-   { 
-    appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight; 
+   {
+    appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight;
     switch ( appMPlayer.sub.x )
      {
       case -1: appMPlayer.subWindow.OldX=( wsMaxX / 2 ) - ( appMPlayer.subWindow.OldWidth / 2 ) + wsOrgX; break;
@@ -94,7 +94,7 @@ void mplEnd( void )
    guiIntfStruct.FilenameChanged=guiIntfStruct.NewPlay=1;
    gfree( (void **)&guiIntfStruct.AudioFile );
    gfree( (void **)&guiIntfStruct.Subtitlename );
-  } 
+  }
   else
     {
      if ( guiIntfStruct.FilenameChanged || guiIntfStruct.NewPlay ) return;
@@ -187,7 +187,7 @@ void ChangeSkin( char * name )
  int bprev = appMPlayer.barIsPresent;
 
  mainVisible=0;
- 
+
  appInitStruct( &tmpList );
  skinAppMPlayer=&tmpList;
  fntFreeFont();
@@ -268,13 +268,13 @@ void ChangeSkin( char * name )
 
  wsSetLayer( wsDisplay,appMPlayer.mainWindow.WindowID,appMPlayer.subWindow.isFullScreen );
  wsSetLayer( wsDisplay,appMPlayer.menuWindow.WindowID,appMPlayer.subWindow.isFullScreen );
- 
+
 }
 
 void mplSetFileName( char * dir,char * name,int type )
 {
  if ( !name ) return;
- 
+
  if ( !dir ) guiSetFilename( guiIntfStruct.Filename,name )
   else guiSetDF( guiIntfStruct.Filename,dir,name );
 
@@ -288,7 +288,7 @@ void mplCurr( void )
 {
  plItem * curr;
  int      stop = 0;
- 
+
  if ( guiIntfStruct.Playing == 2 ) return;
  switch ( guiIntfStruct.StreamType )
   {
@@ -300,7 +300,7 @@ void mplCurr( void )
    case STREAMTYPE_VCD:
 	break;
 #endif
-   default: 
+   default:
 	if ( (curr=gtkSet( gtkGetCurrPlItem,0,NULL)) )
 	 {
 	  mplSetFileName( curr->path,curr->name,STREAMTYPE_FILE );
@@ -318,7 +318,7 @@ void mplPrev( void )
 {
  plItem * prev;
  int      stop = 0;
- 
+
  if ( guiIntfStruct.Playing == 2 ) return;
  switch ( guiIntfStruct.StreamType )
   {
@@ -337,7 +337,7 @@ void mplPrev( void )
 	if ( --guiIntfStruct.Track == 0 ) { guiIntfStruct.Track=1; stop=1; }
 	break;
 #endif
-   default: 
+   default:
 	if ( (prev=gtkSet( gtkGetPrevPlItem,0,NULL)) )
 	 {
 	  mplSetFileName( prev->path,prev->name,STREAMTYPE_FILE );
@@ -374,8 +374,8 @@ void mplNext( void )
 	break;
 #endif
    default:
-	if ( (next=gtkSet( gtkGetNextPlItem,0,NULL)) ) 
-	 { 
+	if ( (next=gtkSet( gtkGetNextPlItem,0,NULL)) )
+	 {
 	  mplSetFileName( next->path,next->name,STREAMTYPE_FILE );
 	  mplGotoTheNext=0;
 	  break;

Modified: trunk/gui/mplayer/sw.c
==============================================================================
--- trunk/gui/mplayer/sw.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/sw.c	Wed May 13 04:58:57 2009	(r29305)
@@ -40,7 +40,7 @@ extern int             i,pot;
 void mplSubDraw( void )
 {
  if ( appMPlayer.subWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );
- 
+
  if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible++;
  if ( appMPlayer.subWindow.State == wsWindowFocusOut && metacity_hack != 3 ) SubVisible--;
 

Modified: trunk/gui/mplayer/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/mplayer/widgets.c	Wed May 13 04:58:57 2009	(r29305)
@@ -86,7 +86,7 @@ void gtkInit( void )
   GtkWidget * win;
   win=gtk_window_new( GTK_WINDOW_TOPLEVEL );
 
-  if ( !gtkIcon ) 
+  if ( !gtkIcon )
     gtkIcon=gdk_pixmap_colormap_create_from_xpm_d( win->window,gdk_colormap_get_system(),&gtkIconMask,&win->style->bg[GTK_STATE_NORMAL],MPlayer_mini_xpm );
 
   guiIcon=GDK_WINDOW_XWINDOW( gtkIcon );
@@ -94,7 +94,7 @@ void gtkInit( void )
 
   gtk_widget_destroy( win );
  }
- 
+
  gtkInitialized=1;
 }
 
@@ -166,7 +166,7 @@ void gtkMessageBox( int type,const gchar
 }
 
 void gtkSetLayer( GtkWidget * wdg )
-{ 
+{
  wsSetLayer( gdk_display,GDK_WINDOW_XWINDOW( wdg->window ),appMPlayer.subWindow.isFullScreen );
  gtkActive( wdg );
 }
@@ -194,8 +194,8 @@ void gtkShow( int type,char * param )
 	  gtk_clist_sort( GTK_CLIST( SkinList ) );
           gtk_widget_show( SkinBrowser );
 	  gtkSetLayer( SkinBrowser );
-         } 
-	 else 
+         }
+	 else
 	  {
 	   gtk_widget_destroy( SkinBrowser );
 	   gtkMessageBox( GTK_MB_ERROR,"Skin dirs not found ... Please install skins." );
@@ -231,20 +231,20 @@ void gtkShow( int type,char * param )
    case evShowPopUpMenu:
         gtkPopupMenu=evNone;
         gtkPopupMenuParam=0;
-        if ( PopUpMenu ) 
-	 { 
-	  gtk_widget_hide( PopUpMenu ); 
+        if ( PopUpMenu )
+	 {
+	  gtk_widget_hide( PopUpMenu );
 	  gtk_widget_destroy( PopUpMenu );
 	 }
         PopUpMenu=create_PopUpMenu();
         gtk_menu_popup( GTK_MENU( PopUpMenu ),NULL,NULL,NULL,NULL,0,0 );
         break;
    case evHidePopUpMenu:
-        if ( PopUpMenu ) 
+        if ( PopUpMenu )
 	 {
 	  gtk_widget_hide( PopUpMenu );
 	  gtk_widget_destroy( PopUpMenu );
-	  PopUpMenu=NULL; 
+	  PopUpMenu=NULL;
 	 }
         break;
    case evPlayNetwork:

Modified: trunk/gui/skin/cut.c
==============================================================================
--- trunk/gui/skin/cut.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/skin/cut.c	Wed May 13 04:58:57 2009	(r29305)
@@ -34,14 +34,14 @@ void cutItem( char * in,char * out,char 
 int cutItemToInt( char * in,char sep,int num )
 {
  char tmp[512];
- cutItem( in,tmp,sep,num ); 
+ cutItem( in,tmp,sep,num );
  return atoi( tmp );
 }
 
 float cutItemToFloat( char * in,char sep,int num )
 {
  char tmp[512];
- cutItem( in,tmp,sep,num ); 
+ cutItem( in,tmp,sep,num );
  return atof( tmp );
 }
 

Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/skin/font.c	Wed May 13 04:58:57 2009	(r29305)
@@ -46,7 +46,7 @@ int fntAddNewFont( char * name )
  if ( ( Fonts[id]=calloc( 1,sizeof( bmpFont ) ) ) == NULL ) return -1;
 
  av_strlcpy( Fonts[id]->name,name,128 ); // FIXME: as defined in font.h
- for ( i=0;i<256;i++ ) 
+ for ( i=0;i<256;i++ )
    Fonts[id]->Fnt[i].x=Fonts[id]->Fnt[i].y=Fonts[id]->Fnt[i].sx=Fonts[id]->Fnt[i].sy=-1;
 
  return id;
@@ -75,14 +75,14 @@ int fntRead( char * path,char * fname )
  unsigned char   param[256];
  int             c,linenumber = 0;
  int             id = fntAddNewFont( fname );
- 
+
  if ( id < 0 ) return id;
 
  av_strlcpy( tmp,path,sizeof( tmp ) );
  av_strlcat( tmp,fname,sizeof( tmp ) ); av_strlcat( tmp,".fnt",sizeof( tmp ) );
- if ( ( f=fopen( tmp,"rt" ) ) == NULL ) 
+ if ( ( f=fopen( tmp,"rt" ) ) == NULL )
    { free( Fonts[id] ); return -3; }
-   
+
  while ( !feof( f ) )
   {
    fgets( tmp,255,f ); linenumber++;
@@ -189,7 +189,7 @@ txSample * fntRender( wItem * item,int p
  tw=fntTextWidth( id,p );
  fbw=Fonts[id]->Bitmap.Width;
 
- if ( item->Bitmap.Image == NULL ) 
+ if ( item->Bitmap.Image == NULL )
   {
    item->Bitmap.Height=item->height=fntTextHeight( id,p );
    item->Bitmap.Width=item->width=iw;
@@ -203,8 +203,8 @@ txSample * fntRender( wItem * item,int p
  ibuf=(uint32_t *)Fonts[id]->Bitmap.Image;
 
  for ( i=0;i < item->Bitmap.ImageSize / 4;i++ ) obuf[i]=0xff00ff;
- 
- if ( tw <= iw ) 
+
+ if ( tw <= iw )
   {
    switch ( item->align )
     {
@@ -213,23 +213,23 @@ txSample * fntRender( wItem * item,int p
      case fntAlignCenter: dx=( iw - fntTextWidth( id,p ) ) / 2; break;
      case fntAlignRight:  dx=iw - fntTextWidth( id,p ); break;
     }
-    
+
   } else dx+=px;
 
  ofs=dx;
- 
+
  for ( i=0;i < (int)strlen( p );i++ )
   {
    c=(unsigned int)p[i];
    fw=Fonts[id]->Fnt[c].sx;
-   
+
    if ( fw == -1 ) { c=32; fw=Fonts[id]->Fnt[c].sx; }
-   
+
    fh=Fonts[id]->Fnt[c].sy;
    fyc=Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x;
    yc=dx;
-     
-   if ( dx >= 0 ) 
+
+   if ( dx >= 0 )
     for ( y=0;y < fh;y++ )
      {
       for ( x=0; x < fw;x++ )
@@ -247,14 +247,14 @@ txSample * fntRender( wItem * item,int p
     {
      c=(unsigned int)p[i];
      fw=Fonts[id]->Fnt[c].sx;
-  
+
      if ( fw == -1 ) { c=32; fw=Fonts[id]->Fnt[c].sx; }
 
      fh=Fonts[id]->Fnt[c].sy;
      fyc=Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x;
 
      dx-=fw; yc=dx;
-     if ( dx >= 0 ) 
+     if ( dx >= 0 )
       for ( y=0;y < fh;y++ )
        {
         for ( x=fw - 1;x >= 0;x-- )

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/skin/skin.c	Wed May 13 04:58:57 2009	(r29305)
@@ -165,7 +165,7 @@ int cmd_base( char * in )
    defList->main.x=x;
    defList->main.y=y;
    defList->main.type=itBase;
-   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp )); 
+   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
    if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1;
    defList->main.width=defList->main.Bitmap.Width;
    defList->main.height=defList->main.Bitmap.Height;
@@ -180,7 +180,7 @@ int cmd_base( char * in )
  if ( !strcmp( window_name,"sub" ) )
   {
    defList->sub.type=itBase;
-   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp )); 
+   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
    if ( skinBPRead( tmp,&defList->sub.Bitmap ) ) return 1;
    defList->sub.x=x;
    defList->sub.y=y;
@@ -197,7 +197,7 @@ int cmd_base( char * in )
   {
    defList->menuIsPresent=1;
    defList->menuBase.type=itBase;
-   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp )); 
+   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
    if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1;
    defList->menuBase.width=defList->menuBase.Bitmap.Width;
    defList->menuBase.height=defList->menuBase.Bitmap.Height;
@@ -215,7 +215,7 @@ int cmd_base( char * in )
    defList->bar.x=x;
    defList->bar.y=y;
    defList->bar.type=itBase;
-   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp )); 
+   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
    if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1;
    defList->bar.width=defList->bar.Bitmap.Width;
    defList->bar.height=defList->bar.Bitmap.Height;
@@ -237,12 +237,12 @@ int cmd_background( char * in )
 
  CHECK( "menu" );
  CHECK( "main" );
- 
+
  currSection->R=cutItemToInt( in,',',0 );
  currSection->G=cutItemToInt( in,',',1 );
  currSection->B=cutItemToInt( in,',',2 );
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"\n[skin]  background color is #%x%x%x.\n",currSection->R,currSection->G,currSection->B );
- 
+
  return 0;
 }
 
@@ -257,7 +257,7 @@ int cmd_button( char * in )
  CHECKWINLIST( "button" );
 
  CHECK( "sub" );
- CHECK( "menu" );  
+ CHECK( "menu" );
 
  cutItem( in,fname,',',0 );
  x=cutItemToInt( in,',',1 );
@@ -286,7 +286,7 @@ int cmd_button( char * in )
  currSubItems[ *currSubItem ].Bitmap.Image=NULL;
  if ( strcmp( fname,"NULL" ) )
   {
-   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp )); 
+   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
    if ( skinBPRead( tmp,&currSubItems[ *currSubItem ].Bitmap ) ) return 1;
   }
 
@@ -307,7 +307,7 @@ int cmd_selected( char * in )
 
  cutItem( in,fname,',',0 );
  defList->menuSelected.type=itBase;
- av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp )); 
+ av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, fname, sizeof( tmp ));
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"\n[skin] selected: %s\n",fname );
  if ( skinBPRead( tmp,&defList->menuSelected.Bitmap ) ) return 1;
  defList->menuSelected.width=defList->menuSelected.Bitmap.Width;
@@ -327,7 +327,7 @@ int cmd_menu( char * in )
  CHECK( "main" );
  CHECK( "sub" );
  CHECK( "playbar" );
- 
+
  x=cutItemToInt( in,',',0 );
  y=cutItemToInt( in,',',1 );
  sx=cutItemToInt( in,',',2 );
@@ -399,14 +399,14 @@ int cmd_hpotmeter( char * in )
  item->Bitmap.Image=NULL;
  if ( strcmp( phfname,"NULL" ) )
   {
-   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, phfname, sizeof( tmp )); 
+   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, phfname, sizeof( tmp ));
    if ( skinBPRead( tmp,&item->Bitmap ) ) return 1;
   }
 
  item->Mask.Image=NULL;
  if ( strcmp( pfname,"NULL" ) )
   {
-   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, pfname, sizeof( tmp )); 
+   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, pfname, sizeof( tmp ));
    if ( skinBPRead( tmp,&item->Mask ) ) return 1;
   }
  return 0;
@@ -463,7 +463,7 @@ int cmd_potmeter( char * in )
  item->Bitmap.Image=NULL;
  if ( strcmp( phfname,"NULL" ) )
   {
-   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, phfname, sizeof( tmp )); 
+   av_strlcpy(tmp, path, sizeof( tmp )); av_strlcat(tmp, phfname, sizeof( tmp ));
    if ( skinBPRead( tmp,&item->Bitmap ) ) return 1;
   }
  return 0;

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/wm/ws.c	Wed May 13 04:58:57 2009	(r29305)
@@ -63,7 +63,7 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
-#undef ENABLE_DPMS 
+#undef ENABLE_DPMS
 
 typedef struct
 {
@@ -126,8 +126,8 @@ inline int wsSearch( Window win );
 
 typedef void(*wsTConvFunc)( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels );
 wsTConvFunc wsConvFunc = NULL;
-										
-void rgb32torgb32( const unsigned char * src, unsigned char * dst,unsigned int src_size )																					
+
+void rgb32torgb32( const unsigned char * src, unsigned char * dst,unsigned int src_size )
 { memcpy( dst,src,src_size ); }
 
 // ---
@@ -166,7 +166,7 @@ void wsWindowDecoration( wsTWindow * win
  if ( wsMotifHints == None ) return;
 
  memset( &wsMotifWmHints,0,sizeof( MotifWmHints ) );
- wsMotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; 
+ wsMotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
  if ( d )
   {
    wsMotifWmHints.functions=MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE;
@@ -218,7 +218,7 @@ if(mDisplay){
 
 /* enable DND atoms */
 wsXDNDInitialize();
- 
+
 { /* on remote display XShm will be disabled - LGB */
  char *dispname=DisplayString(wsDisplay);
  int localdisp=1;
@@ -808,7 +808,7 @@ void wsFullScreen( wsTWindow * win )
 #ifdef ENABLE_DPMS
     wsScreenSaverOff( wsDisplay );
 #endif
-    
+
      vo_x11_ewmh_fullscreen( _NET_WM_STATE_ADD ); // adds fullscreen state if wm supports EWMH
    }
 
@@ -1290,7 +1290,7 @@ void wsSetIcon( Display * dsp,Window win
  XWMHints * wm;
  long	    data[2];
  Atom	    iconatom;
- 
+
  wm=XGetWMHints( dsp,win );
  if ( !wm ) wm=XAllocWMHints();
 
@@ -1304,7 +1304,7 @@ void wsSetIcon( Display * dsp,Window win
  data[1]=mask;
  iconatom=XInternAtom( dsp,"KWM_WIN_ICON",0 );
  XChangeProperty( dsp,win,iconatom,iconatom,32,PropModeReplace,(unsigned char *)data,2 );
- 
+
  XFree( wm );
 }
 

Modified: trunk/gui/wm/wsxdnd.c
==============================================================================
--- trunk/gui/wm/wsxdnd.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/gui/wm/wsxdnd.c	Wed May 13 04:58:57 2009	(r29305)
@@ -138,7 +138,7 @@ wsXDNDProcessSelection(wsTWindow* wnd, X
 	if (num >= MAX_DND_FILES)
 	  break;
       }
-	
+
       /* Handle the files */
       if(wnd->DandDHandler){
 	wnd->DandDHandler(num,files);
@@ -187,7 +187,7 @@ wsXDNDProcessClientMessage(wsTWindow* wn
 			   offset,256,False,XA_ATOM,&ret_type,
 			   &ret_format,&ret_items,&ret_left,
 			   (unsigned char**)&ret_buff);
-	
+
 	/* sanity checks...*/
 	if(ret_buff == NULL || ret_type != XA_ATOM || ret_format != 8*sizeof(Atom)){
 	  XFree(ret_buff);
@@ -210,11 +210,11 @@ wsXDNDProcessClientMessage(wsTWindow* wn
     }
     return True;
   }
-  
+
   if (event->message_type == XA_XdndLeave) {
     return True;
   }
-  
+
   if (event->message_type == XA_XdndDrop) {
     if (event->data.l[0] != XGetSelectionOwner(wsDisplay, XA_XdndSelection)){
       puts("Wierd selection owner... QT?");
@@ -226,7 +226,7 @@ wsXDNDProcessClientMessage(wsTWindow* wn
     }
     return True;
   }
-  
+
   if (event->message_type == XA_XdndPosition) {
     Window srcwin = event->data.l[0];
     if (atom_support == None){
@@ -241,19 +241,19 @@ wsXDNDProcessClientMessage(wsTWindow* wn
       xevent.xany.display = wsDisplay;
       xevent.xclient.window = srcwin;
       xevent.xclient.message_type = XA_XdndStatus;
-      xevent.xclient.format = 32; 
-      
+      xevent.xclient.format = 32;
+
       XDND_STATUS_TARGET_WIN (&xevent) = event->window;
       XDND_STATUS_WILL_ACCEPT_SET (&xevent, True);
       XDND_STATUS_WANT_POSITION_SET(&xevent, True);
       /* actually need smth real here */
       XDND_STATUS_RECT_SET(&xevent, 0, 0, 1024,768);
       XDND_STATUS_ACTION(&xevent) = XA_XdndActionCopy;
-      
+
       XSendEvent(wsDisplay, srcwin, 0, 0, &xevent);
     }
     return True;
   }
-  
+
   return False;
 }

Modified: trunk/input/appleir.c
==============================================================================
--- trunk/input/appleir.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/input/appleir.c	Wed May 13 04:58:57 2009	(r29305)
@@ -68,7 +68,7 @@ static const struct {
   { APPLE_IR_BACKWARD,          2,   AR_PREV_HOLD },
   { APPLE_IR_MENU,              1,   AR_MENU      },
   { APPLE_IR_MENU,              2,   AR_MENU_HOLD },
-  { APPLE_IR_PLUS,              1,   AR_VUP       },  
+  { APPLE_IR_PLUS,              1,   AR_VUP       },
   { APPLE_IR_MINUS,             1,   AR_VDOWN     },
   { -1,                        -1,   -1           }
 };
@@ -102,7 +102,7 @@ int mp_input_appleir_init (char *dev)
       fd = open (file, O_RDONLY | O_NONBLOCK);
       if (fd < 0)
         continue;
-      
+
       ioctl (fd, EVIOCGID, &id);
       if (id.bustype == BUS_USB &&
           id.vendor  == USB_VENDOR_APPLE &&
@@ -147,6 +147,6 @@ int mp_input_appleir_read (int fd)
     if (apple_ir_mapping[i].linux_keycode == ev.code &&
         apple_ir_mapping[i].value == ev.value)
       return apple_ir_mapping[i].mp_keycode;
-  
+
   return MP_INPUT_NOTHING;
 }

Modified: trunk/input/input.c
==============================================================================
--- trunk/input/input.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/input/input.c	Wed May 13 04:58:57 2009	(r29305)
@@ -199,17 +199,17 @@ static const mp_cmd_t mp_cmds[] = {
   { MP_CMD_CEXIT, "exit", 0, { {-1,{0}} } },
   { MP_CMD_CHIDE, "hide", 0, { {MP_CMD_ARG_INT,{3000}}, {-1,{0}} } },
 #endif
- 
+
   { MP_CMD_GET_VO_FULLSCREEN, "get_vo_fullscreen", 0, { {-1,{0}} } },
   { MP_CMD_GET_SUB_VISIBILITY, "get_sub_visibility", 0, { {-1,{0}} } },
   { MP_CMD_KEYDOWN_EVENTS, "key_down_event", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
   { MP_CMD_SET_PROPERTY, "set_property", 2, { {MP_CMD_ARG_STRING, {0}},  {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } },
   { MP_CMD_GET_PROPERTY, "get_property", 1, { {MP_CMD_ARG_STRING, {0}},  {-1,{0}} } },
   { MP_CMD_STEP_PROPERTY, "step_property", 1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_FLOAT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
-  
+
   { MP_CMD_SEEK_CHAPTER, "seek_chapter", 1, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
   { MP_CMD_SET_MOUSE_POS, "set_mouse_pos", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
-  
+
   { 0, NULL, 0, {} }
 };
 
@@ -363,7 +363,7 @@ static const mp_cmd_bind_t def_cmd_binds
   { {  MOUSE_BTN4, 0 }, "seek -10" },
   { {  MOUSE_BTN5, 0 }, "volume 1" },
   { {  MOUSE_BTN6, 0 }, "volume -1" },
-  
+
 #ifdef CONFIG_DVDNAV
   { { KEY_KP8, 0 }, "dvdnav up" },   // up
   { { KEY_KP2, 0 }, "dvdnav down" },   // down
@@ -486,9 +486,9 @@ static const mp_cmd_bind_t def_cmd_binds
   { { KEY_VOLUME_UP, 0 }, "volume 1" },
   { { KEY_VOLUME_DOWN, 0 }, "volume -1" },
   { { KEY_MUTE, 0 }, "mute" },
-          
+
   { { KEY_CLOSE_WIN, 0 }, "quit" },
-  
+
   { { '!', 0 }, "seek_chapter -1" },
   { { '@', 0 }, "seek_chapter 1" },
   { { 'A', 0 }, "switch_angle 1" },
@@ -872,7 +872,7 @@ mp_input_parse_cmd(char* str) {
 	if(e <= ptr2 || *(e - 1) != '\\') break;
 	ptr2 = e + 1;
       }
-      
+
       if(term != ' ' && (!e || e[0] == '\0')) {
 	mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_INPUT_ErrUnterminatedArg,cmd_def->name,i+1);
 	ptr = NULL;
@@ -930,8 +930,8 @@ mp_input_read_cmd(mp_input_fd_t* mp_fd, 
     mp_fd->buffer = malloc(MP_CMD_MAX_SIZE);
     mp_fd->pos = 0;
     mp_fd->size = MP_CMD_MAX_SIZE;
-  } 
-  
+  }
+
   // Get some data if needed/possible
   while (!mp_fd->got_cmd && !mp_fd->eof && (mp_fd->size - mp_fd->pos > 1) ) {
     int r = ((mp_cmd_func_t)mp_fd->read_func)(mp_fd->fd,mp_fd->buffer+mp_fd->pos,mp_fd->size - 1 - mp_fd->pos);
@@ -992,7 +992,7 @@ mp_input_read_cmd(mp_input_fd_t* mp_fd, 
       memmove(mp_fd->buffer,end+1,mp_fd->pos-(l+1));
     mp_fd->pos -= l+1;
   }
-   
+
   if(*ret)
     return 1;
   else
@@ -1028,7 +1028,7 @@ mp_input_add_cmd_filter(mp_input_cmd_fil
   filter->next = cmd_filters;
   cmd_filters = filter;
 }
-  
+
 
 static char*
 mp_input_find_bind_for_key(const mp_cmd_bind_t* binds, int n,int* keys) {
@@ -1130,7 +1130,7 @@ interpret_key(int code, int paused)
       }
       code &= ~MP_KEY_DOWN;
       // Check if we don't already have this key as pushed
-      for(j = 0; j < num_key_down; j++) { 
+      for(j = 0; j < num_key_down; j++) {
 	if(key_down[j] == code)
 	  break;
       }
@@ -1145,7 +1145,7 @@ interpret_key(int code, int paused)
     // key released
     // Check if the key is in the down key, driver which can't send push event
     // send only release event
-    for(j = 0; j < num_key_down; j++) { 
+    for(j = 0; j < num_key_down; j++) {
       if(key_down[j] == code)
 	break;
     }
@@ -1157,7 +1157,7 @@ interpret_key(int code, int paused)
       key_down[num_key_down] = code;
       num_key_down++;
       last_key_down = 1;
-    } 
+    }
     // We ignore key from last combination
     ret = last_key_down ? mp_input_get_cmd_from_keys(num_key_down,key_down,paused) : NULL;
     // Remove the key
@@ -1180,7 +1180,7 @@ static mp_cmd_t *check_autorepeat(int pa
     unsigned int t = GetTimer();
     // First time : wait delay
     if(ar_state == 0 && (t - last_key_down) >= ar_delay*1000) {
-      ar_cmd = mp_input_get_cmd_from_keys(num_key_down,key_down,paused);      
+      ar_cmd = mp_input_get_cmd_from_keys(num_key_down,key_down,paused);
       if(!ar_cmd) {
 	ar_state = -1;
 	return NULL;
@@ -1340,14 +1340,14 @@ mp_input_get_queued_cmd(int peek_only) {
     return NULL;
 
   ret = cmd_queue[cmd_queue_start];
-  
-  if (!peek_only) {  
+
+  if (!peek_only) {
   cmd_queue_length--;
   cmd_queue_start = (cmd_queue_start + 1) % CMD_QUEUE_SIZE;
   }
-  
+
   return ret;
-}  
+}
 
 /**
  * \param peek_only when set, the returned command stays in the queue.
@@ -1401,7 +1401,7 @@ mp_cmd_free(mp_cmd_t* cmd) {
 
   if(cmd->name)
     free(cmd->name);
-  
+
   for(i=0; i < MP_CMD_MAX_ARGS && cmd->args[i].type != -1; i++) {
     if(cmd->args[i].type == MP_CMD_ARG_STRING && cmd->args[i].v.s != NULL)
       free(cmd->args[i].v.s);
@@ -1439,7 +1439,7 @@ mp_input_get_key_name(int key) {
     if(key_names[i].key == key)
       return key_names[i].name;
   }
-  
+
   if(isascii(key)) {
     snprintf(key_str,12,"%c",(char)key);
     return key_str;
@@ -1530,7 +1530,7 @@ mp_input_bind_keys(const int keys[MP_MAX
       }
     }
   }
-  
+
   if(!bind) {
     bind_section->cmd_binds = realloc(bind_section->cmd_binds,(i+2)*sizeof(mp_cmd_bind_t));
     memset(&bind_section->cmd_binds[i],0,2*sizeof(mp_cmd_bind_t));
@@ -1562,7 +1562,7 @@ mp_input_free_binds(mp_cmd_bind_t* binds
   free(binds);
 
 }
-  
+
 static int
 mp_input_parse_config(char *file) {
   int fd;
@@ -1742,11 +1742,11 @@ mp_input_init(int use_gui) {
   if(use_gui)
     mp_input_add_binds(gui_def_cmd_binds);
 #endif
-  
+
   file = config_file[0] != '/' ? get_path(config_file) : config_file;
   if(!file)
     return;
-  
+
   if( !mp_input_parse_config(file)) {
     // free file if it was allocated by get_path(),
     // before it gets overwritten
@@ -1810,7 +1810,7 @@ mp_input_init(int use_gui) {
       mp_input_add_key_fd(fd,1,mp_input_appleir_read,(mp_close_func_t)close);
   }
 #endif
-  
+
   if(in_file) {
     struct stat st;
     if(stat(in_file,&st))

Modified: trunk/input/input.h
==============================================================================
--- trunk/input/input.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/input/input.h	Wed May 13 04:58:57 2009	(r29305)
@@ -139,7 +139,7 @@ typedef enum {
   MP_CMD_DVDNAV_SELECT,
   MP_CMD_DVDNAV_PREVMENU,
   MP_CMD_DVDNAV_MOUSECLICK,
-  
+
   /// GUI commands
   MP_CMD_GUI_EVENTS = 5000,
   MP_CMD_GUI_LOADFILE,
@@ -183,7 +183,7 @@ typedef enum {
 #define MP_INPUT_RETRY -4
 
 // For the key's drivers, if possible you can send key up and key down
-// events. Key up is the default, to send a key down you must use the 
+// events. Key up is the default, to send a key down you must use the
 // OR operator between the key code and MP_KEY_DOWN.
 #define MP_KEY_DOWN (1<<29)
 // Use this when the key shouldn't be auto-repeated (like mouse buttons)

Modified: trunk/input/joystick.c
==============================================================================
--- trunk/input/joystick.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/input/joystick.c	Wed May 13 04:58:57 2009	(r29305)
@@ -50,7 +50,7 @@ int mp_input_joystick_init(char* dev) {
   int fd,l=0;
   int initialized = 0;
   struct js_event ev;
-  
+
   mp_msg(MSGT_INPUT,MSGL_V,MSGTR_INPUT_JOYSTICK_Opening,dev ? dev : JS_DEV);
 
   fd = open( dev ? dev : JS_DEV , O_RDONLY | O_NONBLOCK );
@@ -58,7 +58,7 @@ int mp_input_joystick_init(char* dev) {
     mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_JOYSTICK_CantOpen,dev ? dev : JS_DEV,strerror(errno));
     return -1;
   }
-  
+
   while(! initialized) {
     l = 0;
     while((unsigned int)l < sizeof(struct js_event)) {
@@ -73,12 +73,12 @@ int mp_input_joystick_init(char* dev) {
 	mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_JOYSTICK_ErrReading,strerror(errno));
 	close(fd);
 	return -1;
-      }	
+      }
       l += r;
     }
     if((unsigned int)l < sizeof(struct js_event)) {
       if(l > 0)
-	mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_INPUT_JOYSTICK_LoosingBytes,l);	  
+	mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_INPUT_JOYSTICK_LoosingBytes,l);
       break;
     }
     if(ev.type == JS_EVENT_BUTTON)
@@ -86,7 +86,7 @@ int mp_input_joystick_init(char* dev) {
     if(ev.type == JS_EVENT_AXIS)
       axis[ev.number] = ev.value;
   }
-	
+
   return fd;
 }
 
@@ -104,9 +104,9 @@ int mp_input_joystick_read(int fd) {
       if( r < 0)
 	mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_JOYSTICK_ErrReading,strerror(errno));
       else
-	mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_JOYSTICK_ErrReading,"EOF"); 
+	mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_JOYSTICK_ErrReading,"EOF");
       return MP_INPUT_DEAD;
-    } 	
+    }
     l += r;
   }
 
@@ -117,7 +117,7 @@ int mp_input_joystick_read(int fd) {
   }
 
   if(ev.type & JS_EVENT_INIT) {
-    mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_INPUT_JOYSTICK_WarnLostSync);	
+    mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_INPUT_JOYSTICK_WarnLostSync);
     ev.type &= ~JS_EVENT_INIT;
     if(ev.type == JS_EVENT_BUTTON) {
       int s = (btns >> ev.number) & 1;
@@ -130,9 +130,9 @@ int mp_input_joystick_read(int fd) {
 	  (axis[ev.number] == 0 && ev.value >= -JOY_AXIS_DELTA && ev.value <= JOY_AXIS_DELTA)
 	  ) // State is the same : ignore
 	return MP_INPUT_NOTHING;
-    }	
+    }
   }
-  
+
   if(ev.type & JS_EVENT_BUTTON) {
     btns &= ~(1 << ev.number);
     btns |= (ev.value << ev.number);
@@ -154,7 +154,7 @@ int mp_input_joystick_read(int fd) {
     } else
       return MP_INPUT_NOTHING;
   } else {
-    mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_INPUT_JOYSTICK_WarnUnknownEvent,ev.type);	
+    mp_msg(MSGT_INPUT,MSGL_WARN,MSGTR_INPUT_JOYSTICK_WarnUnknownEvent,ev.type);
     return MP_INPUT_ERROR;
   }
 

Modified: trunk/input/lirc.c
==============================================================================
--- trunk/input/lirc.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/input/lirc.c	Wed May 13 04:58:57 2009	(r29305)
@@ -35,7 +35,7 @@ char *lirc_configfile;
 
 static char* cmd_buf = NULL;
 
-int 
+int
 mp_input_lirc_init(void) {
   int lirc_sock;
   int mode;
@@ -81,7 +81,7 @@ int mp_input_lirc_read(int fd,char* dest
     }
     return w;
   }
-      
+
   // Nothing in the buffer, poll the lirc fd
   if(lirc_nextcode(&code) != 0) {
     mp_msg(MSGT_LIRC,MSGL_ERR,"Lirc error :(\n");

Modified: trunk/input/lirc.h
==============================================================================
--- trunk/input/lirc.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/input/lirc.h	Wed May 13 04:58:57 2009	(r29305)
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_LIRC_H
 #define MPLAYER_LIRC_H
 
-int 
+int
 mp_input_lirc_init(void);
 
 int

Modified: trunk/libaf/af.c
==============================================================================
--- trunk/libaf/af.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af.c	Wed May 13 04:58:57 2009	(r29305)
@@ -51,7 +51,7 @@ extern af_info_t af_info_scaletempo;
 extern af_info_t af_info_stats;
 extern af_info_t af_info_bs2b;
 
-static af_info_t* filter_list[]={ 
+static af_info_t* filter_list[]={
    &af_info_dummy,
    &af_info_delay,
    &af_info_channels,
@@ -88,7 +88,7 @@ static af_info_t* filter_list[]={ 
 #ifdef CONFIG_LIBBS2B
    &af_info_bs2b,
 #endif
-   NULL 
+   NULL
 };
 
 // CPU speed
@@ -106,13 +106,13 @@ static af_info_t* af_find(char*name)
   }
   mp_msg(MSGT_AFILTER, MSGL_ERR, "Couldn't find audio filter '%s'\n",name);
   return NULL;
-} 
+}
 
 /* Find filter in the dynamic filter list using it's name This
    function is used for finding already initialized filters */
 af_instance_t* af_get(af_stream_t* s, char* name)
 {
-  af_instance_t* af=s->first; 
+  af_instance_t* af=s->first;
   // Find the filter
   while(af != NULL){
     if(!strcmp(af->info->name,name))
@@ -134,7 +134,7 @@ static af_instance_t* af_create(af_strea
   if (!name || !new) {
     mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Could not allocate memory\n");
     goto err_out;
-  }  
+  }
   memset(new,0,sizeof(af_instance_t));
 
   // Check for commandline parameters
@@ -148,29 +148,29 @@ static af_instance_t* af_create(af_strea
      non-reentrant */
   if(new->info->flags & AF_FLAGS_NOT_REENTRANT){
     if(af_get(s,name)){
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] There can only be one instance of" 
-	     " the filter '%s' in each stream\n",name);  
+      mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] There can only be one instance of"
+	     " the filter '%s' in each stream\n",name);
       goto err_out;
     }
   }
-  
+
   mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Adding filter %s \n",name);
-  
+
   // Initialize the new filter
-  if(AF_OK == new->info->open(new) && 
+  if(AF_OK == new->info->open(new) &&
      AF_ERROR < new->control(new,AF_CONTROL_POST_CREATE,&s->cfg)){
     if(cmdline){
       if(AF_ERROR>=new->control(new,AF_CONTROL_COMMAND_LINE,cmdline))
         goto err_out;
     }
     free(name);
-    return new; 
+    return new;
   }
-  
+
 err_out:
   free(new);
   mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Couldn't create or open audio filter '%s'\n",
-	 name);  
+	 name);
   free(name);
   return NULL;
 }
@@ -228,8 +228,8 @@ void af_remove(af_stream_t* s, af_instan
 {
   if(!af) return;
 
-  // Print friendly message 
-  mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Removing filter %s \n",af->info->name); 
+  // Print friendly message
+  mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Removing filter %s \n",af->info->name);
 
   // Notify filter before changing anything
   af->control(af,AF_CONTROL_PRE_DESTROY,0);
@@ -244,7 +244,7 @@ void af_remove(af_stream_t* s, af_instan
   else
     s->last=af->prev;
 
-  // Uninitialize af and free memory   
+  // Uninitialize af and free memory
   af->uninit(af);
   free(af);
 }
@@ -260,21 +260,21 @@ static int af_reinit(af_stream_t* s, af_
 
     // Check if there are any filters left in the list
     if(NULL == af){
-      if(!(af=af_append(s,s->first,"dummy"))) 
-	return AF_UNKNOWN; 
+      if(!(af=af_append(s,s->first,"dummy")))
+	return AF_UNKNOWN;
       else
 	return AF_ERROR;
     }
 
-    // Check if this is the first filter 
-    if(!af->prev) 
+    // Check if this is the first filter
+    if(!af->prev)
       memcpy(&in,&(s->input),sizeof(af_data_t));
     else
       memcpy(&in,af->prev->data,sizeof(af_data_t));
     // Reset just in case...
     in.audio=NULL;
     in.len=0;
-    
+
     rv = af->control(af,AF_CONTROL_REINIT,&in);
     switch(rv){
     case AF_OK:
@@ -293,7 +293,7 @@ static int af_reinit(af_stream_t* s, af_
 	  if(AF_OK != (rv = new->control(new,AF_CONTROL_CHANNELS,&in.nch)))
 	    return rv;
 	  // Initialize channels filter
-	  if(!new->prev) 
+	  if(!new->prev)
 	    memcpy(&in,&(s->input),sizeof(af_data_t));
 	  else
 	    memcpy(&in,new->prev->data,sizeof(af_data_t));
@@ -310,7 +310,7 @@ static int af_reinit(af_stream_t* s, af_
 	  if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_FMT,&in.format)))
 	    return rv;
 	  // Initialize format filter
-	  if(!new->prev) 
+	  if(!new->prev)
 	    memcpy(&in,&(s->input),sizeof(af_data_t));
 	  else
 	    memcpy(&in,new->prev->data,sizeof(af_data_t));
@@ -318,7 +318,7 @@ static int af_reinit(af_stream_t* s, af_
 	    return rv;
 	}
 	if(!new){ // Should _never_ happen
-	  mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to correct audio format. " 
+	  mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to correct audio format. "
 		 "This error should never uccur, please send bugreport.\n");
 	  return AF_ERROR;
 	}
@@ -344,7 +344,7 @@ static int af_reinit(af_stream_t* s, af_
       break;
     }
     default:
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Reinitialization did not work, audio" 
+      mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Reinitialization did not work, audio"
 	     " filter '%s' returned error code %i\n",af->info->name,rv);
       return AF_ERROR;
     }
@@ -387,8 +387,8 @@ int af_init(af_stream_t* s)
   if(!s->first){
     // Add all filters in the list (if there are any)
     if(!s->cfg.list){      // To make automatic format conversion work
-      if(!af_append(s,s->first,"dummy")) 
-	return -1; 
+      if(!af_append(s,s->first,"dummy"))
+	return -1;
     }
     else{
       while(s->cfg.list[i]){
@@ -398,7 +398,7 @@ int af_init(af_stream_t* s)
     }
   }
 
-  // Init filters 
+  // Init filters
   if(AF_OK != af_reinit(s,s->first))
     return -1;
 
@@ -426,7 +426,7 @@ int af_init(af_stream_t* s)
 	    af = af_append(s,s->first,resampler);
 	  else
 	    af = af_prepend(s,s->first,resampler);
-	}		
+	}
 	else{
 	  if(!strcmp(s->last->info->name,"format"))
 	    af = af_prepend(s,s->last,resampler);
@@ -452,8 +452,8 @@ int af_init(af_stream_t* s)
       }
       if(AF_OK != af_reinit(s,af))
       	return -1;
-    }	
-      
+    }
+
     // Check number of output channels fix if not OK
     // If needed always inserted last -> easy to screw up other filters
     if(s->output.nch && s->last->data->nch!=s->output.nch){
@@ -467,7 +467,7 @@ int af_init(af_stream_t* s)
       if(AF_OK != af_reinit(s,af))
 	return -1;
     }
-    
+
     // Check output format fix if not OK
     if(s->output.format != AF_FORMAT_UNKNOWN &&
 		s->last->data->format != s->output.format){
@@ -491,11 +491,11 @@ int af_init(af_stream_t* s)
 	s->output.format = s->last->data->format;
     if (!s->output.nch) s->output.nch = s->last->data->nch;
     if (!s->output.rate) s->output.rate = s->last->data->rate;
-    if((s->last->data->format != s->output.format) || 
-       (s->last->data->nch    != s->output.nch)    || 
+    if((s->last->data->format != s->output.format) ||
+       (s->last->data->nch    != s->output.nch)    ||
        (s->last->data->rate   != s->output.rate))  {
-      // Something is stuffed audio out will not work 
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to setup filter system can not" 
+      // Something is stuffed audio out will not work
+      mp_msg(MSGT_AFILTER, MSGL_ERR, "[libaf] Unable to setup filter system can not"
 	     " meet sound-card demands, please send bugreport. \n");
       af_uninit(s);
       return -1;
@@ -532,8 +532,8 @@ af_instance_t* af_add(af_stream_t* s, ch
 // Filter data chunk through the filters in the list
 af_data_t* af_play(af_stream_t* s, af_data_t* data)
 {
-  af_instance_t* af=s->first; 
-  // Iterate through all filters 
+  af_instance_t* af=s->first;
+  // Iterate through all filters
   do{
     if (data->len <= 0) break;
     data=af->play(af,data);
@@ -555,7 +555,7 @@ int af_lencalc(double mul, af_data_t* d)
 // Calculate average ratio of filter output size to input size
 double af_calc_filter_multiplier(af_stream_t* s)
 {
-  af_instance_t* af=s->first; 
+  af_instance_t* af=s->first;
   double mul = 1;
   // Iterate through all filters and calculate total multiplication factor
   do{
@@ -569,9 +569,9 @@ double af_calc_filter_multiplier(af_stre
 /* Calculate the total delay [bytes output] caused by the filters */
 double af_calc_delay(af_stream_t* s)
 {
-  af_instance_t* af=s->first; 
+  af_instance_t* af=s->first;
   register double delay = 0.0;
-  // Iterate through all filters 
+  // Iterate through all filters
   while(af){
     delay += af->delay;
     delay *= af->mul;
@@ -586,10 +586,10 @@ int af_resize_local_buffer(af_instance_t
 {
   // Calculate new length
   register int len = af_lencalc(af->mul,data);
-  mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Reallocating memory in module %s, " 
+  mp_msg(MSGT_AFILTER, MSGL_V, "[libaf] Reallocating memory in module %s, "
 	 "old len = %i, new len = %i\n",af->info->name,af->data->len,len);
   // If there is a buffer free it
-  if(af->data->audio) 
+  if(af->data->audio)
     free(af->data->audio);
   // Create new buffer and check that it is OK
   af->data->audio = malloc(len);

Modified: trunk/libaf/af.h
==============================================================================
--- trunk/libaf/af.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af.h	Wed May 13 04:58:57 2009	(r29305)
@@ -33,7 +33,7 @@
 #undef AF_INIT_TYPE
 #define AF_INIT_TYPE \
   ((gCpuCaps.has3DNow || gCpuCaps.hasSSE)?AF_INIT_FAST:AF_INIT_SLOW)
-#endif 
+#endif
 
 struct af_instance_s;
 
@@ -59,8 +59,8 @@ typedef struct af_data_s
 #define AF_FLAGS_NOT_REENTRANT 	0x00000001
 
 /* Audio filter information not specific for current instance, but for
-   a specific filter */ 
-typedef struct af_info_s 
+   a specific filter */
+typedef struct af_info_s
 {
   const char *info;
   const char *name;
@@ -80,7 +80,7 @@ typedef struct af_instance_s
   void* setup;	  // setup data for this specific instance and filter
   af_data_t* data; // configuration for outgoing data stream
   struct af_instance_s* next;
-  struct af_instance_s* prev;  
+  struct af_instance_s* prev;
   double delay; /* Delay caused by the filter, in units of bytes read without
 		 * corresponding output */
   double mul; /* length multiplier: how much does this instance change
@@ -100,7 +100,7 @@ extern int* af_cpu_speed;
 #define AF_INIT_FLOAT		0x00000004
 #define AF_INIT_FORMAT_MASK	0x00000004
 
-// Default init type 
+// Default init type
 #ifndef AF_INIT_TYPE
 #if HAVE_SSE || HAVE_AMD3DNOW
 #define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_FAST)
@@ -194,7 +194,7 @@ void af_remove(af_stream_t* s, af_instan
  * \brief find filter in chain by name
  * \param name name of the filter to find
  * \return first filter with right name or NULL if not found
- * 
+ *
  * This function is used for finding already initialized filters
  */
 af_instance_t* af_get(af_stream_t* s, char* name);
@@ -288,7 +288,7 @@ int af_from_ms(int n, float* in, int* ou
  * \param rate sample rate
  * \return AF_ERROR on error, AF_OK otherwise
  */
-int af_to_ms(int n, int* in, float* out, int rate); 
+int af_to_ms(int n, int* in, float* out, int rate);
 
 /**
  * \brief test if output format matches
@@ -317,7 +317,7 @@ void af_help(void);
  * \brief fill the missing parameters in the af_data_t structure
  * \param data structure to fill
  * \ingroup af_filter
- * 
+ *
  * Currently only sets bps based on format
  */
 void af_fix_parameters(af_data_t *data);
@@ -344,7 +344,7 @@ void af_fix_parameters(af_data_t *data);
 #endif
 
 #ifndef sign
-#define sign(a) (((a)>0)?(1):(-1)) 
+#define sign(a) (((a)>0)?(1):(-1))
 #endif
 
 #ifndef lrnd

Modified: trunk/libaf/af_center.c
==============================================================================
--- trunk/libaf/af_center.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_center.c	Wed May 13 04:58:57 2009	(r29305)
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h> 
+#include <string.h>
 
 #include "af.h"
 
@@ -40,7 +40,7 @@ typedef struct af_center_s
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_center_t* s   = af->setup; 
+  af_center_t* s   = af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:{
@@ -75,7 +75,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -90,7 +90,7 @@ static af_data_t* play(struct af_instanc
   af_data_t*    c   = data;	 // Current working data
   af_center_t*  s   = af->setup; // Setup for this instance
   float*   	a   = c->audio;	 // Audio data
-  int		len = c->len/4;	 // Number of samples in current audio block 
+  int		len = c->len/4;	 // Number of samples in current audio block
   int		nch = c->nch;	 // Number of channels
   int		ch  = s->ch;	 // Channel in which to insert the center audio
   register int  i;

Modified: trunk/libaf/af_channels.c
==============================================================================
--- trunk/libaf/af_channels.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_channels.c	Wed May 13 04:58:57 2009	(r29305)
@@ -108,7 +108,7 @@ static void copy(void* in, void* out, in
     break;
   }
   default:
-    mp_msg(MSGT_AFILTER, MSGL_ERR, "[channels] Unsupported number of bytes/sample: %i" 
+    mp_msg(MSGT_AFILTER, MSGL_ERR, "[channels] Unsupported number of bytes/sample: %i"
 	   " please report this error on the MPlayer mailing list. \n",bps);
   }
 }
@@ -118,11 +118,11 @@ static int check_routes(af_channels_t* s
 {
   int i;
   if((s->nr < 1) || (s->nr > AF_NCH)){
-    mp_msg(MSGT_AFILTER, MSGL_ERR, "[channels] The number of routing pairs must be" 
+    mp_msg(MSGT_AFILTER, MSGL_ERR, "[channels] The number of routing pairs must be"
 	   " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
     return AF_ERROR;
   }
-	
+
   for(i=0;i<s->nr;i++){
     if((s->route[i][FR] >= nin) || (s->route[i][TO] >= nout)){
       mp_msg(MSGT_AFILTER, MSGL_ERR, "[channels] Invalid routing in pair nr. %i.\n", i);
@@ -142,7 +142,7 @@ static int control(struct af_instance_s*
     // Set default channel assignment
     if(!s->router){
       int i;
-      // Make sure this filter isn't redundant 
+      // Make sure this filter isn't redundant
       if(af->data->nch == ((af_data_t*)arg)->nch)
 	return AF_DETACH;
 
@@ -180,14 +180,14 @@ static int control(struct af_instance_s*
       int ch = 0;
       // Sanity check
       if((s->nr < 1) || (s->nr > AF_NCH)){
-	mp_msg(MSGT_AFILTER, MSGL_ERR, "[channels] The number of routing pairs must be" 
+	mp_msg(MSGT_AFILTER, MSGL_ERR, "[channels] The number of routing pairs must be"
 	     " between 1 and %i. Current value is %i\n",AF_NCH,s->nr);
-      }	
+      }
       s->router = 1;
       // Scan for pairs on commandline
       while((*cp == ':') && (ch < s->nr)){
 	sscanf(cp, ":%i:%i%n" ,&s->route[ch][FR], &s->route[ch][TO], &n);
-	mp_msg(MSGT_AFILTER, MSGL_V, "[channels] Routing from channel %i to" 
+	mp_msg(MSGT_AFILTER, MSGL_V, "[channels] Routing from channel %i to"
 	       " channel %i\n",s->route[ch][FR],s->route[ch][TO]);
 	cp = &cp[n];
 	ch++;
@@ -197,20 +197,20 @@ static int control(struct af_instance_s*
     if(AF_OK != af->control(af,AF_CONTROL_CHANNELS | AF_CONTROL_SET ,&nch))
       return AF_ERROR;
     return AF_OK;
-  }    
-  case AF_CONTROL_CHANNELS | AF_CONTROL_SET: 
+  }
+  case AF_CONTROL_CHANNELS | AF_CONTROL_SET:
     // Reinit must be called after this function has been called
-    
+
     // Sanity check
     if(((int*)arg)[0] <= 0 || ((int*)arg)[0] > AF_NCH){
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[channels] The number of output channels must be" 
+      mp_msg(MSGT_AFILTER, MSGL_ERR, "[channels] The number of output channels must be"
 	     " between 1 and %i. Current value is %i\n",AF_NCH,((int*)arg)[0]);
       return AF_ERROR;
     }
 
-    af->data->nch=((int*)arg)[0]; 
+    af->data->nch=((int*)arg)[0];
     if(!s->router)
-      mp_msg(MSGT_AFILTER, MSGL_V, "[channels] Changing number of channels" 
+      mp_msg(MSGT_AFILTER, MSGL_V, "[channels] Changing number of channels"
 	     " to %i\n",af->data->nch);
     return AF_OK;
   case AF_CONTROL_CHANNELS | AF_CONTROL_GET:
@@ -246,7 +246,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   free(af->setup);
@@ -262,18 +262,18 @@ static af_data_t* play(struct af_instanc
   af_data_t*   	 l = af->data;	 		// Local data
   af_channels_t* s = af->setup;
   int 		 i;
-  
+
   if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
     return NULL;
 
   // Reset unused channels
   memset(l->audio,0,c->len / c->nch * l->nch);
-  
+
   if(AF_OK == check_routes(s,c->nch,l->nch))
     for(i=0;i<s->nr;i++)
       copy(c->audio,l->audio,c->nch,s->route[i][FR],
 	   l->nch,s->route[i][TO],c->len,c->bps);
-  
+
   // Set output data
   c->audio = l->audio;
   c->len   = c->len / c->nch * l->nch;

Modified: trunk/libaf/af_comp.c
==============================================================================
--- trunk/libaf/af_comp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_comp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -43,21 +43,21 @@ typedef struct af_comp_s
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_comp_t* s   = (af_comp_t*)af->setup; 
+  af_comp_t* s   = (af_comp_t*)af->setup;
   int i;
 
   switch(cmd){
   case AF_CONTROL_REINIT:
     // Sanity check
     if(!arg) return AF_ERROR;
-    
+
     af->data->rate   = ((af_data_t*)arg)->rate;
     af->data->nch    = ((af_data_t*)arg)->nch;
     af->data->format = AF_FORMAT_FLOAT_NE;
     af->data->bps    = 4;
 
     // Time constant set to 0.1s
-    //    s->alpha = (1.0/0.2)/(2.0*M_PI*(float)((af_data_t*)arg)->rate); 
+    //    s->alpha = (1.0/0.2)/(2.0*M_PI*(float)((af_data_t*)arg)->rate);
     return af_test_output(af,(af_data_t*)arg);
   case AF_CONTROL_COMMAND_LINE:{
 /*     float v=-10.0; */
@@ -76,10 +76,10 @@ static int control(struct af_instance_s*
   }
   case AF_CONTROL_COMP_ON_OFF | AF_CONTROL_SET:
     memcpy(s->enable,(int*)arg,AF_NCH*sizeof(int));
-    return AF_OK; 
+    return AF_OK;
   case AF_CONTROL_COMP_ON_OFF | AF_CONTROL_GET:
     memcpy((int*)arg,s->enable,AF_NCH*sizeof(int));
-    return AF_OK; 
+    return AF_OK;
   case AF_CONTROL_COMP_THRESH | AF_CONTROL_SET:
     return af_from_dB(AF_NCH,(float*)arg,s->tresh,20.0,-60.0,-1.0);
   case AF_CONTROL_COMP_THRESH | AF_CONTROL_GET:
@@ -93,18 +93,18 @@ static int control(struct af_instance_s*
   case AF_CONTROL_COMP_RELEASE | AF_CONTROL_GET:
     return af_to_ms(AF_NCH,s->release,(float*)arg,af->data->rate);
   case AF_CONTROL_COMP_RATIO | AF_CONTROL_SET:
-    for(i=0;i<AF_NCH;i++) 
+    for(i=0;i<AF_NCH;i++)
       s->ratio[i] = clamp(((float*)arg)[i],1.0,10.0);
     return AF_OK;
   case AF_CONTROL_COMP_RATIO | AF_CONTROL_GET:
-    for(i=0;i<AF_NCH;i++) 
+    for(i=0;i<AF_NCH;i++)
       ((float*)arg)[i] = s->ratio[i];
-    return AF_OK; 
+    return AF_OK;
   }
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -121,7 +121,7 @@ static af_data_t* play(struct af_instanc
   float*   	a   = (float*)c->audio;		// Audio data
   int       	len = c->len/4;			// Number of samples
   int           ch  = 0;			// Channel counter
-  register int	nch = c->nch;			// Number of channels	
+  register int	nch = c->nch;			// Number of channels
   register int  i   = 0;
 
   // Compress/expand
@@ -130,8 +130,8 @@ static af_data_t* play(struct af_instanc
       float	t   = 1.0 - s->time[ch];
       for(i=ch;i<len;i+=nch){
 	register float x 	= a[i];
-	register float pow 	= x*x;	
-	s->pow[ch] = t*s->pow[ch] + 
+	register float pow 	= x*x;
+	s->pow[ch] = t*s->pow[ch] +
 	  pow*s->time[ch]; // LP filter
 	if(pow < s->pow[ch]){
 	  ;

Modified: trunk/libaf/af_delay.c
==============================================================================
--- trunk/libaf/af_delay.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_delay.c	Wed May 13 04:58:57 2009	(r29305)
@@ -37,7 +37,7 @@ typedef struct af_delay_s
   void* q[AF_NCH];   	// Circular queues used for delaying audio signal
   int 	wi[AF_NCH];  	// Write index
   int 	ri;		// Read index
-  float	d[AF_NCH];   	// Delay [ms] 	
+  float	d[AF_NCH];   	// Delay [ms]
 }af_delay_t;
 
 // Initialization and runtime control
@@ -108,7 +108,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   int i;
@@ -134,7 +134,7 @@ static af_data_t* play(struct af_instanc
     switch(c->bps){
     case 1:{
       int8_t* a = c->audio;
-      int8_t* q = s->q[ch]; 
+      int8_t* q = s->q[ch];
       int wi = s->wi[ch];
       ri = s->ri;
       for(i=ch;i<len;i+=nch){
@@ -148,7 +148,7 @@ static af_data_t* play(struct af_instanc
     }
     case 2:{
       int16_t* a = c->audio;
-      int16_t* q = s->q[ch]; 
+      int16_t* q = s->q[ch];
       int wi = s->wi[ch];
       ri = s->ri;
       for(i=ch;i<len;i+=nch){
@@ -162,7 +162,7 @@ static af_data_t* play(struct af_instanc
     }
     case 4:{
       int32_t* a = c->audio;
-      int32_t* q = s->q[ch]; 
+      int32_t* q = s->q[ch];
       int wi = s->wi[ch];
       ri = s->ri;
       for(i=ch;i<len;i+=nch){

Modified: trunk/libaf/af_dummy.c
==============================================================================
--- trunk/libaf/af_dummy.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_dummy.c	Wed May 13 04:58:57 2009	(r29305)
@@ -38,7 +38,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)

Modified: trunk/libaf/af_equalizer.c
==============================================================================
--- trunk/libaf/af_equalizer.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_equalizer.c	Wed May 13 04:58:57 2009	(r29305)
@@ -32,13 +32,13 @@
 #include "af.h"
 
 #define L   	2      // Storage for filter taps
-#define KM  	10     // Max number of bands 
+#define KM  	10     // Max number of bands
 
 #define Q   1.2247449 /* Q value for band-pass filters 1.2247=(3/2)^(1/2)
 			 gives 4dB suppression @ Fc*2 and Fc/2 */
 
 /* Center frequencies for band-pass filters
-   The different frequency bands are:	
+   The different frequency bands are:
    nr.    	center frequency
    0  	31.25 Hz
    1 	62.50 Hz
@@ -55,7 +55,7 @@
 
 // Maximum and minimum gain for the bands
 #define G_MAX	+12.0
-#define G_MIN	-12.0	
+#define G_MIN	-12.0
 
 // Data for specific instances of this filter
 typedef struct af_equalizer_s
@@ -76,7 +76,7 @@ static void bp2(float* a, float* b, floa
 
   a[0] = (1.0 + C) * cos(th);
   a[1] = -1 * C;
-  
+
   b[0] = (1.0 - C)/2.0;
   b[1] = -1.0050;
 }
@@ -84,30 +84,30 @@ static void bp2(float* a, float* b, floa
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_equalizer_t* s   = (af_equalizer_t*)af->setup; 
+  af_equalizer_t* s   = (af_equalizer_t*)af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:{
     int k =0, i =0;
     float F[KM] = CF;
-    
+
     s->gain_factor=0.0;
 
     // Sanity check
     if(!arg) return AF_ERROR;
-    
+
     af->data->rate   = ((af_data_t*)arg)->rate;
     af->data->nch    = ((af_data_t*)arg)->nch;
     af->data->format = AF_FORMAT_FLOAT_NE;
     af->data->bps    = 4;
-    
+
     // Calculate number of active filters
     s->K=KM;
     while(F[s->K-1] > (float)af->data->rate/2.2)
       s->K--;
-    
+
     if(s->K != KM)
-      mp_msg(MSGT_AFILTER, MSGL_INFO, "[equalizer] Limiting the number of filters to" 
+      mp_msg(MSGT_AFILTER, MSGL_INFO, "[equalizer] Limiting the number of filters to"
 	     " %i due to low sample rate.\n",s->K);
 
     // Generate filter taps
@@ -116,7 +116,7 @@ static int control(struct af_instance_s*
 
     // Calculate how much this plugin adds to the overall time delay
     af->delay = 2 * af->data->nch * af->data->bps;
-    
+
     // Calculate gain factor to prevent clipping at output
     for(k=0;k<AF_NCH;k++)
     {
@@ -127,24 +127,24 @@ static int control(struct af_instance_s*
     }
 
     s->gain_factor=log10(s->gain_factor + 1.0) * 20.0;
-	 
+
     if(s->gain_factor > 0.0)
     {
         s->gain_factor=0.1+(s->gain_factor/12.0);
     }else{
         s->gain_factor=1;
     }
-	
+
     return af_test_output(af,arg);
   }
   case AF_CONTROL_COMMAND_LINE:{
     float g[10]={0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0};
     int i,j;
-    sscanf((char*)arg,"%f:%f:%f:%f:%f:%f:%f:%f:%f:%f", &g[0], &g[1], 
+    sscanf((char*)arg,"%f:%f:%f:%f:%f:%f:%f:%f:%f:%f", &g[0], &g[1],
 	   &g[2], &g[3], &g[4], &g[5], &g[6], &g[7], &g[8] ,&g[9]);
     for(i=0;i<AF_NCH;i++){
       for(j=0;j<KM;j++){
-	((af_equalizer_t*)af->setup)->g[i][j] = 
+	((af_equalizer_t*)af->setup)->g[i][j] =
 	  pow(10.0,clamp(g[j],G_MIN,G_MAX)/20.0)-1.0;
       }
     }
@@ -178,7 +178,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -191,12 +191,12 @@ static void uninit(struct af_instance_s*
 static af_data_t* play(struct af_instance_s* af, af_data_t* data)
 {
   af_data_t*       c 	= data;			    	// Current working data
-  af_equalizer_t*  s 	= (af_equalizer_t*)af->setup; 	// Setup 
+  af_equalizer_t*  s 	= (af_equalizer_t*)af->setup; 	// Setup
   uint32_t  	   ci  	= af->data->nch; 	    	// Index for channels
   uint32_t	   nch 	= af->data->nch;   	    	// Number of channels
 
   while(ci--){
-    float*	g   = s->g[ci];      // Gain factor 
+    float*	g   = s->g[ci];      // Gain factor
     float*	in  = ((float*)c->audio)+ci;
     float*	out = ((float*)c->audio)+ci;
     float* 	end = in + c->len/4; // Block loop end
@@ -205,7 +205,7 @@ static af_data_t* play(struct af_instanc
       register int	k  = 0;		// Frequency band index
       register float 	yt = *in; 	// Current input sample
       in+=nch;
-      
+
       // Run the filters
       for(;k<s->K;k++){
  	// Pointer to circular buffer wq
@@ -218,7 +218,7 @@ static af_data_t* play(struct af_instanc
  	wq[1] = wq[0];
 	wq[0] = w;
       }
-      // Calculate output 
+      // Calculate output
       *out=yt*s->gain_factor;
       out+=nch;
     }

Modified: trunk/libaf/af_export.c
==============================================================================
--- trunk/libaf/af_export.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_export.c	Wed May 13 04:58:57 2009	(r29305)
@@ -41,7 +41,7 @@
 #include "get_path.h"
 
 #define DEF_SZ 512 // default buffer size (in samples)
-#define SHARED_FILE "mplayer-af_export" /* default file name 
+#define SHARED_FILE "mplayer-af_export" /* default file name
 					   (relative to ~/.mplayer/ */
 
 #define SIZE_HEADER (2 * sizeof(int) + sizeof(unsigned long long))
@@ -81,46 +81,46 @@ static int control(struct af_instance_s*
       munmap(s->mmap_area, SIZE_HEADER + (af->data->bps*s->sz*af->data->nch));
     // close previous file descriptor
     if(s->fd)
-      close(s->fd);	
+      close(s->fd);
 
     // Accept only int16_t as input format (which sucks)
     af->data->rate   = ((af_data_t*)arg)->rate;
     af->data->nch    = ((af_data_t*)arg)->nch;
     af->data->format = AF_FORMAT_S16_NE;
     af->data->bps    = 2;
-	
+
     // If buffer length isn't set, set it to the default value
     if(s->sz == 0)
       s->sz = DEF_SZ;
-	
+
     // Allocate new buffers (as one continuous block)
     s->buf[0] = calloc(s->sz*af->data->nch, af->data->bps);
     if(NULL == s->buf[0])
       mp_msg(MSGT_AFILTER, MSGL_FATAL, "[export] Out of memory\n");
     for(i = 1; i < af->data->nch; i++)
       s->buf[i] = s->buf[0] + i*s->sz*af->data->bps;
-	
+
     // Init memory mapping
     s->fd = open(s->filename, O_RDWR | O_CREAT | O_TRUNC, 0640);
     mp_msg(MSGT_AFILTER, MSGL_INFO, "[export] Exporting to file: %s\n", s->filename);
     if(s->fd < 0)
-      mp_msg(MSGT_AFILTER, MSGL_FATAL, "[export] Could not open/create file: %s\n", 
+      mp_msg(MSGT_AFILTER, MSGL_FATAL, "[export] Could not open/create file: %s\n",
 	     s->filename);
-    
+
     // header + buffer
     mapsize = (SIZE_HEADER + (af->data->bps * s->sz * af->data->nch));
-    
+
     // grow file to needed size
     for(i = 0; i < mapsize; i++){
       char null = 0;
       write(s->fd, (void*) &null, 1);
     }
-	
+
     // mmap size
     s->mmap_area = mmap(0, mapsize, PROT_READ|PROT_WRITE,MAP_SHARED, s->fd, 0);
     if(s->mmap_area == NULL)
       mp_msg(MSGT_AFILTER, MSGL_FATAL, "[export] Could not mmap file %s\n", s->filename);
-    mp_msg(MSGT_AFILTER, MSGL_INFO, "[export] Memory mapped to file: %s (%p)\n", 
+    mp_msg(MSGT_AFILTER, MSGL_INFO, "[export] Memory mapped to file: %s (%p)\n",
 	   s->filename, s->mmap_area);
 
     // Initialize header
@@ -134,15 +134,15 @@ static int control(struct af_instance_s*
   case AF_CONTROL_COMMAND_LINE:{
     int i=0;
     char *str = arg;
-    
+
     if (!str){
-      if(s->filename) 
+      if(s->filename)
 	free(s->filename);
 
       s->filename = get_path(SHARED_FILE);
       return AF_OK;
     }
-	
+
     while((str[i]) && (str[i] != ':'))
       i++;
 
@@ -152,9 +152,9 @@ static int control(struct af_instance_s*
     s->filename = calloc(i + 1, 1);
     memcpy(s->filename, str, i);
     s->filename[i] = 0;
-	
+
     sscanf(str + i + 1, "%d", &(s->sz));
-  
+
     return af->control(af, AF_CONTROL_EXPORT_SZ | AF_CONTROL_SET, &s->sz);
   }
   case AF_CONTROL_EXPORT_SZ | AF_CONTROL_SET:
@@ -167,7 +167,7 @@ static int control(struct af_instance_s*
   case AF_CONTROL_EXPORT_SZ | AF_CONTROL_GET:
     *(int*) arg = s->sz;
     return AF_OK;
-      
+
   }
   return AF_UNKNOWN;
 }
@@ -186,10 +186,10 @@ static void uninit( struct af_instance_s
     af_export_t* s = af->setup;
     if (s->buf && s->buf[0])
       free(s->buf[0]);
-    
+
     // Free mmaped area
     if(s->mmap_area)
-      munmap(s->mmap_area, sizeof(af_export_t));	  
+      munmap(s->mmap_area, sizeof(af_export_t));
 
     if(s->fd > -1)
       close(s->fd);
@@ -215,15 +215,15 @@ static af_data_t* play( struct af_instan
   int		len = c->len/c->bps; // Number of sample in data chunk
   int 		sz  = s->sz;         // buffer size (in samples)
   int 		flag = 0;	     // Set to 1 if buffer is filled
-  
+
   int 		ch, i;
 
   // Fill all buffers
   for(ch = 0; ch < nch; ch++){
     int 	wi = s->wi;    	 // Reset write index
-    int16_t* 	b  = s->buf[ch]; // Current buffer 
+    int16_t* 	b  = s->buf[ch]; // Current buffer
 
-    // Copy data to export buffers 
+    // Copy data to export buffers
     for(i = ch; i < len; i += nch){
       b[wi++] = a[i];
       if(wi >= sz){ // Don't write outside the end of the buffer
@@ -239,7 +239,7 @@ static af_data_t* play( struct af_instan
     // update buffer in mapped area
     memcpy(s->mmap_area + SIZE_HEADER, s->buf[0], sz * c->bps * nch);
     s->count++; // increment counter (to sync)
-    memcpy(s->mmap_area + SIZE_HEADER - sizeof(s->count), 
+    memcpy(s->mmap_area + SIZE_HEADER - sizeof(s->count),
 	   &(s->count), sizeof(s->count));
   }
 
@@ -248,7 +248,7 @@ static af_data_t* play( struct af_instan
 }
 
 /* Allocate memory and set function pointers
-   af audio filter instance 
+   af audio filter instance
    returns AF_OK or AF_ERROR
 */
 static int af_open( af_instance_t* af )

Modified: trunk/libaf/af_extrastereo.c
==============================================================================
--- trunk/libaf/af_extrastereo.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_extrastereo.c	Wed May 13 04:58:57 2009	(r29305)
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h> 
+#include <string.h>
 
 #include <inttypes.h>
 #include <math.h>
@@ -40,13 +40,13 @@ static af_data_t* play_float(struct af_i
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_extrastereo_t* s   = (af_extrastereo_t*)af->setup; 
+  af_extrastereo_t* s   = (af_extrastereo_t*)af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:{
     // Sanity check
     if(!arg) return AF_ERROR;
-    
+
     af->data->rate   = ((af_data_t*)arg)->rate;
     af->data->nch    = 2;
     if (((af_data_t*)arg)->format == AF_FORMAT_FLOAT_NE)
@@ -79,7 +79,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -96,11 +96,11 @@ static af_data_t* play_s16(struct af_ins
   int16_t *a = (int16_t*)data->audio;	// Audio data
   int len = data->len/2;		// Number of samples
   int avg, l, r;
-  
+
   for (i = 0; i < len; i+=2)
   {
     avg = (a[i] + a[i + 1]) / 2;
-    
+
     l = avg + (int)(s->mul * (a[i] - avg));
     r = avg + (int)(s->mul * (a[i + 1] - avg));
 
@@ -118,14 +118,14 @@ static af_data_t* play_float(struct af_i
   float *a = (float*)data->audio;	// Audio data
   int len = data->len/4;		// Number of samples
   float avg, l, r;
-  
+
   for (i = 0; i < len; i+=2)
   {
     avg = (a[i] + a[i + 1]) / 2;
-    
+
     l = avg + (s->mul * (a[i] - avg));
     r = avg + (s->mul * (a[i + 1] - avg));
-    
+
     a[i] = af_softclip(l);
     a[i + 1] = af_softclip(r);
   }

Modified: trunk/libaf/af_format.c
==============================================================================
--- trunk/libaf/af_format.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_format.c	Wed May 13 04:58:57 2009	(r29305)
@@ -36,7 +36,7 @@
    format */
 
 /* The below includes retrieves functions for converting to and from
-   ulaw and alaw */ 
+   ulaw and alaw */
 #include "af_format_ulaw.h"
 #include "af_format_alaw.h"
 
@@ -62,7 +62,7 @@ static af_data_t* play_s16_float(struct 
 static int check_bps(int bps)
 {
   if(bps != 4 && bps != 3 && bps != 2 && bps != 1){
-    mp_msg(MSGT_AFILTER, MSGL_ERR, "[format] The number of bytes per sample" 
+    mp_msg(MSGT_AFILTER, MSGL_ERR, "[format] The number of bytes per sample"
 	   " must be 1, 2, 3 or 4. Current value is %i \n",bps);
     return AF_ERROR;
   }
@@ -74,11 +74,11 @@ static int check_format(int format)
 {
   char buf[256];
   switch(format & AF_FORMAT_SPECIAL_MASK){
-  case(AF_FORMAT_IMA_ADPCM): 
-  case(AF_FORMAT_MPEG2): 
+  case(AF_FORMAT_IMA_ADPCM):
+  case(AF_FORMAT_MPEG2):
   case(AF_FORMAT_AC3):
     mp_msg(MSGT_AFILTER, MSGL_ERR, "[format] Sample format %s not yet supported \n",
-	 af_fmt2str(format,buf,256)); 
+	 af_fmt2str(format,buf,256));
     return AF_ERROR;
   }
   return AF_OK;
@@ -92,9 +92,9 @@ static int control(struct af_instance_s*
     char buf1[256];
     char buf2[256];
     af_data_t *data = arg;
-    
-    // Make sure this filter isn't redundant 
-    if(af->data->format == data->format && 
+
+    // Make sure this filter isn't redundant
+    if(af->data->format == data->format &&
        af->data->bps == data->bps)
       return AF_DETACH;
 
@@ -112,9 +112,9 @@ static int control(struct af_instance_s*
     af->data->rate = data->rate;
     af->data->nch  = data->nch;
     af->mul        = (double)af->data->bps / data->bps;
-    
+
     af->play = play; // set default
-    
+
     // look whether only endianness differences are there
     if ((af->data->format & ~AF_FORMAT_END_MASK) ==
 	(data->format & ~AF_FORMAT_END_MASK))
@@ -164,13 +164,13 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if (af->data)
       free(af->data->audio);
   free(af->data);
-  af->setup = 0;  
+  af->setup = 0;
 }
 
 static af_data_t* play_swapendian(struct af_instance_s* af, af_data_t* data)
@@ -271,10 +271,10 @@ static af_data_t* play(struct af_instanc
     }
   } else {
     // Input must be int
-    
+
     // Change signed/unsigned
     if((c->format&AF_FORMAT_SIGN_MASK) != (l->format&AF_FORMAT_SIGN_MASK)){
-      si2us(c->audio,len,c->bps); 
+      si2us(c->audio,len,c->bps);
     }
     // Convert to special formats
     switch(l->format&(AF_FORMAT_SPECIAL_MASK|AF_FORMAT_POINT_MASK)){
@@ -297,7 +297,7 @@ static af_data_t* play(struct af_instanc
     }
   }
 
-  // Switch from cpu native endian to the correct endianness 
+  // Switch from cpu native endian to the correct endianness
   if((l->format&AF_FORMAT_END_MASK)!=AF_FORMAT_NE)
     endian(l->audio,l->audio,len,l->bps);
 
@@ -450,7 +450,7 @@ static void change_bps(void* in, void* o
 	((uint32_t*)out)[i]=(uint32_t)load24bit(in, i);
       break;
     }
-    break;      
+    break;
   case(4):
     switch(outbps){
     case(1):
@@ -466,7 +466,7 @@ static void change_bps(void* in, void* o
         store24bit(out, i, ((uint32_t*)in)[i]);
       break;
     }
-    break;      
+    break;
   }
 }
 
@@ -478,7 +478,7 @@ static void float2int(float* in, void* o
     for(i=0;i<len;i++)
       ((int8_t*)out)[i] = lrintf(127.0 * in[i]);
     break;
-  case(2): 
+  case(2):
     for(i=0;i<len;i++)
       ((int16_t*)out)[i] = lrintf(32767.0 * in[i]);
     break;
@@ -490,7 +490,7 @@ static void float2int(float* in, void* o
     for(i=0;i<len;i++)
       ((int32_t*)out)[i] = lrintf(2147483647.0 * in[i]);
     break;
-  }	
+  }
 }
 
 static void int2float(void* in, float* out, int len, int bps)
@@ -513,5 +513,5 @@ static void int2float(void* in, float* o
     for(i=0;i<len;i++)
       out[i]=(1.0/2147483648.0)*((int32_t*)in)[i];
     break;
-  }	
+  }
 }

Modified: trunk/libaf/af_format_alaw.h
==============================================================================
--- trunk/libaf/af_format_alaw.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_format_alaw.h	Wed May 13 04:58:57 2009	(r29305)
@@ -30,195 +30,195 @@
 
 // Conversion tables (the function are below)
 static short alaw_decode [128] =
-{	 -5504,  -5248,  -6016,  -5760,  -4480,  -4224,  -4992,  -4736, 
-	 -7552,  -7296,  -8064,  -7808,  -6528,  -6272,  -7040,  -6784, 
-	 -2752,  -2624,  -3008,  -2880,  -2240,  -2112,  -2496,  -2368, 
-	 -3776,  -3648,  -4032,  -3904,  -3264,  -3136,  -3520,  -3392, 
-	-22016, -20992, -24064, -23040, -17920, -16896, -19968, -18944, 
-	-30208, -29184, -32256, -31232, -26112, -25088, -28160, -27136, 
-	-11008, -10496, -12032, -11520,  -8960,  -8448,  -9984,  -9472, 
-	-15104, -14592, -16128, -15616, -13056, -12544, -14080, -13568, 
-	  -344,   -328,   -376,   -360,   -280,   -264,   -312,   -296, 
-	  -472,   -456,   -504,   -488,   -408,   -392,   -440,   -424, 
-	   -88,    -72,   -120,   -104,    -24,     -8,    -56,    -40, 
-	  -216,   -200,   -248,   -232,   -152,   -136,   -184,   -168, 
-	 -1376,  -1312,  -1504,  -1440,  -1120,  -1056,  -1248,  -1184, 
-	 -1888,  -1824,  -2016,  -1952,  -1632,  -1568,  -1760,  -1696, 
-	  -688,   -656,   -752,   -720,   -560,   -528,   -624,   -592, 
+{	 -5504,  -5248,  -6016,  -5760,  -4480,  -4224,  -4992,  -4736,
+	 -7552,  -7296,  -8064,  -7808,  -6528,  -6272,  -7040,  -6784,
+	 -2752,  -2624,  -3008,  -2880,  -2240,  -2112,  -2496,  -2368,
+	 -3776,  -3648,  -4032,  -3904,  -3264,  -3136,  -3520,  -3392,
+	-22016, -20992, -24064, -23040, -17920, -16896, -19968, -18944,
+	-30208, -29184, -32256, -31232, -26112, -25088, -28160, -27136,
+	-11008, -10496, -12032, -11520,  -8960,  -8448,  -9984,  -9472,
+	-15104, -14592, -16128, -15616, -13056, -12544, -14080, -13568,
+	  -344,   -328,   -376,   -360,   -280,   -264,   -312,   -296,
+	  -472,   -456,   -504,   -488,   -408,   -392,   -440,   -424,
+	   -88,    -72,   -120,   -104,    -24,     -8,    -56,    -40,
+	  -216,   -200,   -248,   -232,   -152,   -136,   -184,   -168,
+	 -1376,  -1312,  -1504,  -1440,  -1120,  -1056,  -1248,  -1184,
+	 -1888,  -1824,  -2016,  -1952,  -1632,  -1568,  -1760,  -1696,
+	  -688,   -656,   -752,   -720,   -560,   -528,   -624,   -592,
 	  -944,   -912,  -1008,   -976,   -816,   -784,   -880,   -848
 } ; /* alaw_decode */
 
 static unsigned char alaw_encode [2049] =
-{	0xD5, 0xD4, 0xD7, 0xD6, 0xD1, 0xD0, 0xD3, 0xD2, 0xDD, 0xDC, 0xDF, 0xDE, 
-	0xD9, 0xD8, 0xDB, 0xDA, 0xC5, 0xC4, 0xC7, 0xC6, 0xC1, 0xC0, 0xC3, 0xC2, 
-	0xCD, 0xCC, 0xCF, 0xCE, 0xC9, 0xC8, 0xCB, 0xCA, 0xF5, 0xF5, 0xF4, 0xF4, 
-	0xF7, 0xF7, 0xF6, 0xF6, 0xF1, 0xF1, 0xF0, 0xF0, 0xF3, 0xF3, 0xF2, 0xF2, 
-	0xFD, 0xFD, 0xFC, 0xFC, 0xFF, 0xFF, 0xFE, 0xFE, 0xF9, 0xF9, 0xF8, 0xF8, 
-	0xFB, 0xFB, 0xFA, 0xFA, 0xE5, 0xE5, 0xE5, 0xE5, 0xE4, 0xE4, 0xE4, 0xE4, 
-	0xE7, 0xE7, 0xE7, 0xE7, 0xE6, 0xE6, 0xE6, 0xE6, 0xE1, 0xE1, 0xE1, 0xE1, 
-	0xE0, 0xE0, 0xE0, 0xE0, 0xE3, 0xE3, 0xE3, 0xE3, 0xE2, 0xE2, 0xE2, 0xE2, 
-	0xED, 0xED, 0xED, 0xED, 0xEC, 0xEC, 0xEC, 0xEC, 0xEF, 0xEF, 0xEF, 0xEF, 
-	0xEE, 0xEE, 0xEE, 0xEE, 0xE9, 0xE9, 0xE9, 0xE9, 0xE8, 0xE8, 0xE8, 0xE8, 
-	0xEB, 0xEB, 0xEB, 0xEB, 0xEA, 0xEA, 0xEA, 0xEA, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0xB5, 0xB5, 0xB5, 0xB5, 
-	0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 
-	0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 
-	0xB5, 0xB5, 0xB5, 0xB5, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 
-	0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 
-	0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 
-	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 
-	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 
-	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB6, 0xB6, 0xB6, 0xB6, 
-	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 
-	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 
-	0xB6, 0xB6, 0xB6, 0xB6, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 
-	0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 
-	0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 
-	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 
-	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 
-	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB3, 0xB3, 0xB3, 0xB3, 
-	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 
-	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 
-	0xB3, 0xB3, 0xB3, 0xB3, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 
-	0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 
-	0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 
-	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 
-	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 
-	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBC, 0xBC, 0xBC, 0xBC, 
-	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 
-	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 
-	0xBC, 0xBC, 0xBC, 0xBC, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 
-	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 
-	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 
-	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 
-	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 
-	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB9, 0xB9, 0xB9, 0xB9, 
-	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 
-	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 
-	0xB9, 0xB9, 0xB9, 0xB9, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 
-	0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 
-	0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 
-	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 
-	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 
-	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBA, 0xBA, 0xBA, 0xBA, 
-	0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 
-	0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 
-	0xBA, 0xBA, 0xBA, 0xBA, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
+{	0xD5, 0xD4, 0xD7, 0xD6, 0xD1, 0xD0, 0xD3, 0xD2, 0xDD, 0xDC, 0xDF, 0xDE,
+	0xD9, 0xD8, 0xDB, 0xDA, 0xC5, 0xC4, 0xC7, 0xC6, 0xC1, 0xC0, 0xC3, 0xC2,
+	0xCD, 0xCC, 0xCF, 0xCE, 0xC9, 0xC8, 0xCB, 0xCA, 0xF5, 0xF5, 0xF4, 0xF4,
+	0xF7, 0xF7, 0xF6, 0xF6, 0xF1, 0xF1, 0xF0, 0xF0, 0xF3, 0xF3, 0xF2, 0xF2,
+	0xFD, 0xFD, 0xFC, 0xFC, 0xFF, 0xFF, 0xFE, 0xFE, 0xF9, 0xF9, 0xF8, 0xF8,
+	0xFB, 0xFB, 0xFA, 0xFA, 0xE5, 0xE5, 0xE5, 0xE5, 0xE4, 0xE4, 0xE4, 0xE4,
+	0xE7, 0xE7, 0xE7, 0xE7, 0xE6, 0xE6, 0xE6, 0xE6, 0xE1, 0xE1, 0xE1, 0xE1,
+	0xE0, 0xE0, 0xE0, 0xE0, 0xE3, 0xE3, 0xE3, 0xE3, 0xE2, 0xE2, 0xE2, 0xE2,
+	0xED, 0xED, 0xED, 0xED, 0xEC, 0xEC, 0xEC, 0xEC, 0xEF, 0xEF, 0xEF, 0xEF,
+	0xEE, 0xEE, 0xEE, 0xEE, 0xE9, 0xE9, 0xE9, 0xE9, 0xE8, 0xE8, 0xE8, 0xE8,
+	0xEB, 0xEB, 0xEB, 0xEB, 0xEA, 0xEA, 0xEA, 0xEA, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0xB5, 0xB5, 0xB5, 0xB5,
+	0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5,
+	0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5,
+	0xB5, 0xB5, 0xB5, 0xB5, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4,
+	0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4,
+	0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4,
+	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7,
+	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7,
+	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB6, 0xB6, 0xB6, 0xB6,
+	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+	0xB6, 0xB6, 0xB6, 0xB6, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1,
+	0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1,
+	0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1,
+	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0,
+	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0,
+	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB3, 0xB3, 0xB3, 0xB3,
+	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3,
+	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3,
+	0xB3, 0xB3, 0xB3, 0xB3, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2,
+	0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2,
+	0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2,
+	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD,
+	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD,
+	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBC, 0xBC, 0xBC, 0xBC,
+	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC,
+	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC,
+	0xBC, 0xBC, 0xBC, 0xBC, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF,
+	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF,
+	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF,
+	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE,
+	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE,
+	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xB9, 0xB9, 0xB9, 0xB9,
+	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9,
+	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9,
+	0xB9, 0xB9, 0xB9, 0xB9, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8,
+	0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8,
+	0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8,
+	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
+	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
+	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBA, 0xBA, 0xBA, 0xBA,
+	0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA,
+	0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA,
+	0xBA, 0xBA, 0xBA, 0xBA, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
 	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0x2A
 } ; /* alaw_encode */
 
@@ -229,17 +229,17 @@ static int from_alaw(void* in, void* out
   // Make sure the input parametrs are OK
   if(format & (AF_FORMAT_SPECIAL_MASK | AF_FORMAT_US))
       return AF_ERROR;
-    
+
   // Convert to int or to float
   if((format & AF_FORMAT_POINT_MASK) == AF_FORMAT_I){
     switch(bps){
-    case(1): 
+    case(1):
       for(i=0;i<len;i++){
 	if(((int8_t*)in)[i] & 0x80)
 	  ((int8_t*)out)[i] = (-1 * alaw_decode[(((int8_t*)in)[i]) & 0x7F]) >> 8;
 	else
 	  ((int8_t*)out)[i] = (alaw_decode[(((int8_t*)in)[i]) & 0x7F]) >> 8;
-      } 
+      }
       break;
     case(2):
       for(i=0;i<len;i++){
@@ -247,7 +247,7 @@ static int from_alaw(void* in, void* out
 	  ((int16_t*)out)[i] = -1 * alaw_decode[(((int8_t*)in)[i]) & 0x7F];
 	else
 	  ((int16_t*)out)[i] = alaw_decode[(((int8_t*)in)[i]) & 0x7F];
-      } 
+      }
       break;
     case(4):
       for(i=0;i<len;i++){
@@ -255,7 +255,7 @@ static int from_alaw(void* in, void* out
 	  ((int32_t*)out)[i] = (-1 * alaw_decode[(((int8_t*)in)[i]) & 0x7F]) << 16;
 	else
 	  ((int32_t*)out)[i] = (alaw_decode[(((int8_t*)in)[i]) & 0x7F]) << 16;
-      } 
+      }
       break;
     default:
       return AF_ERROR;
@@ -279,11 +279,11 @@ static int to_alaw(void* in, void* out, 
   // Make sure the input parametrs are OK
   if(format & (AF_FORMAT_SPECIAL_MASK | AF_FORMAT_US))
       return AF_ERROR;
-    
+
   // Convert from int or to float
   if((format & AF_FORMAT_POINT_MASK) == AF_FORMAT_I){
     switch(bps){
-    case(1): 
+    case(1):
       for(i=0;i<len;i++){
 	if(((int8_t*)in)[i] >= 0)
 	  ((int8_t*)out)[i] = alaw_encode[((int8_t*)in)[i] << 4];
@@ -291,7 +291,7 @@ static int to_alaw(void* in, void* out, 
 	  ((int8_t*)out)[i] = 0x7F & alaw_encode[-((int8_t*)in)[i] << 4];
       }
       break;
-    case(2): 
+    case(2):
       for(i=0;i<len;i++){
 	if(((int16_t*)in)[i] >= 0)
 	  ((int8_t*)out)[i] = alaw_encode[((int16_t*)in)[i] / 16];
@@ -299,7 +299,7 @@ static int to_alaw(void* in, void* out, 
 	  ((int8_t*)out)[i] = 0x7F & alaw_encode[((int16_t*)in)[i] / -16];
       }
       break;
-    case(4): 
+    case(4):
       for(i=0;i<len;i++){
 	if(((int32_t*)in)[i] >= 0)
 	  ((int8_t*)out)[i] = alaw_encode[((int32_t*)in)[i] >> (16 + 4)];

Modified: trunk/libaf/af_format_ulaw.h
==============================================================================
--- trunk/libaf/af_format_ulaw.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_format_ulaw.h	Wed May 13 04:58:57 2009	(r29305)
@@ -29,707 +29,707 @@
 #include "af.h"
 // Conversion tables (the function are below)
 static short ulaw_decode[128] =
-{	-32124, -31100, -30076, -29052, -28028, -27004, -25980, -24956, 
-	-23932, -22908, -21884, -20860, -19836, -18812, -17788, -16764, 
-	-15996, -15484, -14972, -14460, -13948, -13436, -12924, -12412, 
-	-11900, -11388, -10876, -10364,  -9852,  -9340,  -8828,  -8316, 
-	 -7932,  -7676,  -7420,  -7164,  -6908,  -6652,  -6396,  -6140, 
-	 -5884,  -5628,  -5372,  -5116,  -4860,  -4604,  -4348,  -4092, 
-	 -3900,  -3772,  -3644,  -3516,  -3388,  -3260,  -3132,  -3004, 
-	 -2876,  -2748,  -2620,  -2492,  -2364,  -2236,  -2108,  -1980, 
-	 -1884,  -1820,  -1756,  -1692,  -1628,  -1564,  -1500,  -1436, 
-	 -1372,  -1308,  -1244,  -1180,  -1116,  -1052,   -988,   -924, 
-	  -876,   -844,   -812,   -780,   -748,   -716,   -684,   -652, 
-	  -620,   -588,   -556,   -524,   -492,   -460,   -428,   -396, 
-	  -372,   -356,   -340,   -324,   -308,   -292,   -276,   -260, 
-	  -244,   -228,   -212,   -196,   -180,   -164,   -148,   -132, 
-	  -120,   -112,   -104,    -96,    -88,    -80,    -72,    -64, 
-	   -56,    -48,    -40,    -32,    -24,    -16,     -8,      0, 
+{	-32124, -31100, -30076, -29052, -28028, -27004, -25980, -24956,
+	-23932, -22908, -21884, -20860, -19836, -18812, -17788, -16764,
+	-15996, -15484, -14972, -14460, -13948, -13436, -12924, -12412,
+	-11900, -11388, -10876, -10364,  -9852,  -9340,  -8828,  -8316,
+	 -7932,  -7676,  -7420,  -7164,  -6908,  -6652,  -6396,  -6140,
+	 -5884,  -5628,  -5372,  -5116,  -4860,  -4604,  -4348,  -4092,
+	 -3900,  -3772,  -3644,  -3516,  -3388,  -3260,  -3132,  -3004,
+	 -2876,  -2748,  -2620,  -2492,  -2364,  -2236,  -2108,  -1980,
+	 -1884,  -1820,  -1756,  -1692,  -1628,  -1564,  -1500,  -1436,
+	 -1372,  -1308,  -1244,  -1180,  -1116,  -1052,   -988,   -924,
+	  -876,   -844,   -812,   -780,   -748,   -716,   -684,   -652,
+	  -620,   -588,   -556,   -524,   -492,   -460,   -428,   -396,
+	  -372,   -356,   -340,   -324,   -308,   -292,   -276,   -260,
+	  -244,   -228,   -212,   -196,   -180,   -164,   -148,   -132,
+	  -120,   -112,   -104,    -96,    -88,    -80,    -72,    -64,
+	   -56,    -48,    -40,    -32,    -24,    -16,     -8,      0,
 } ;
 
 static unsigned char ulaw_encode[8193] =
-{	0xFF, 0xFE, 0xFE, 0xFD, 0xFD, 0xFC, 0xFC, 0xFB, 0xFB, 0xFA, 0xFA, 0xF9, 
-	0xF9, 0xF8, 0xF8, 0xF7, 0xF7, 0xF6, 0xF6, 0xF5, 0xF5, 0xF4, 0xF4, 0xF3, 
-	0xF3, 0xF2, 0xF2, 0xF1, 0xF1, 0xF0, 0xF0, 0xEF, 0xEF, 0xEF, 0xEF, 0xEE, 
-	0xEE, 0xEE, 0xEE, 0xED, 0xED, 0xED, 0xED, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 
-	0xEB, 0xEB, 0xEB, 0xEA, 0xEA, 0xEA, 0xEA, 0xE9, 0xE9, 0xE9, 0xE9, 0xE8, 
-	0xE8, 0xE8, 0xE8, 0xE7, 0xE7, 0xE7, 0xE7, 0xE6, 0xE6, 0xE6, 0xE6, 0xE5, 
-	0xE5, 0xE5, 0xE5, 0xE4, 0xE4, 0xE4, 0xE4, 0xE3, 0xE3, 0xE3, 0xE3, 0xE2, 
-	0xE2, 0xE2, 0xE2, 0xE1, 0xE1, 0xE1, 0xE1, 0xE0, 0xE0, 0xE0, 0xE0, 0xDF, 
-	0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE, 
-	0xDE, 0xDE, 0xDE, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDC, 
-	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 
-	0xDB, 0xDB, 0xDB, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xD9, 
-	0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8, 
-	0xD8, 0xD8, 0xD8, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD6, 
-	0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5, 
-	0xD5, 0xD5, 0xD5, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD3, 
-	0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2, 
-	0xD2, 0xD2, 0xD2, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD0, 
-	0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 
-	0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCE, 
-	0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 
-	0xCE, 0xCE, 0xCE, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 
-	0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 
-	0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCB, 
-	0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 
-	0xCB, 0xCB, 0xCB, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 
-	0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 
-	0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC8, 
-	0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 
-	0xC8, 0xC8, 0xC8, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 
-	0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 
-	0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC5, 
-	0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 
-	0xC5, 0xC5, 0xC5, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 
-	0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 
-	0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC2, 
-	0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 
-	0xC2, 0xC2, 0xC2, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 
-	0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 
-	0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xBF, 
-	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 
-	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 
-	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 
-	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 
-	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 
-	0xBE, 0xBE, 0xBE, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 
-	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 
-	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBC, 
-	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 
-	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 
-	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 
-	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 
-	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 
-	0xBB, 0xBB, 0xBB, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 
-	0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 
-	0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xB9, 
-	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 
-	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 
-	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 
-	0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 
-	0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 
-	0xB8, 0xB8, 0xB8, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 
-	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 
-	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB6, 
-	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 
-	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 
-	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 
-	0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 
-	0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 
-	0xB5, 0xB5, 0xB5, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 
-	0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 
-	0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB3, 
-	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 
-	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 
-	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 
-	0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 
-	0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 
-	0xB2, 0xB2, 0xB2, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 
-	0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 
-	0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB0, 
-	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 
-	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 
-	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 
-	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 
-	0xAE, 0xAE, 0xAE, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 
-	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 
-	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 
-	0xAB, 0xAB, 0xAB, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 
-	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 
-	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 
-	0xA8, 0xA8, 0xA8, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 
-	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 
-	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 
-	0xA5, 0xA5, 0xA5, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 
-	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 
-	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 
-	0xA2, 0xA2, 0xA2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 
-	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 
-	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 
-	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 
-	0x9E, 0x9E, 0x9E, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 
-	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 
-	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 
-	0x9B, 0x9B, 0x9B, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 
-	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 
-	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 
-	0x98, 0x98, 0x98, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 
-	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 
-	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 
-	0x95, 0x95, 0x95, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 
-	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 
-	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 
-	0x92, 0x92, 0x92, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 
-	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 
-	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 
-	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 
-	0x8E, 0x8E, 0x8E, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 
-	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 
-	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 
-	0x8B, 0x8B, 0x8B, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 
-	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 
-	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 
-	0x88, 0x88, 0x88, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 
-	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 
-	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 
-	0x85, 0x85, 0x85, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 
-	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 
-	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 
-	0x82, 0x82, 0x82, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 
-	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
+{	0xFF, 0xFE, 0xFE, 0xFD, 0xFD, 0xFC, 0xFC, 0xFB, 0xFB, 0xFA, 0xFA, 0xF9,
+	0xF9, 0xF8, 0xF8, 0xF7, 0xF7, 0xF6, 0xF6, 0xF5, 0xF5, 0xF4, 0xF4, 0xF3,
+	0xF3, 0xF2, 0xF2, 0xF1, 0xF1, 0xF0, 0xF0, 0xEF, 0xEF, 0xEF, 0xEF, 0xEE,
+	0xEE, 0xEE, 0xEE, 0xED, 0xED, 0xED, 0xED, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB,
+	0xEB, 0xEB, 0xEB, 0xEA, 0xEA, 0xEA, 0xEA, 0xE9, 0xE9, 0xE9, 0xE9, 0xE8,
+	0xE8, 0xE8, 0xE8, 0xE7, 0xE7, 0xE7, 0xE7, 0xE6, 0xE6, 0xE6, 0xE6, 0xE5,
+	0xE5, 0xE5, 0xE5, 0xE4, 0xE4, 0xE4, 0xE4, 0xE3, 0xE3, 0xE3, 0xE3, 0xE2,
+	0xE2, 0xE2, 0xE2, 0xE1, 0xE1, 0xE1, 0xE1, 0xE0, 0xE0, 0xE0, 0xE0, 0xDF,
+	0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDF, 0xDE, 0xDE, 0xDE, 0xDE, 0xDE,
+	0xDE, 0xDE, 0xDE, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDD, 0xDC,
+	0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB,
+	0xDB, 0xDB, 0xDB, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xD9,
+	0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD9, 0xD8, 0xD8, 0xD8, 0xD8, 0xD8,
+	0xD8, 0xD8, 0xD8, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD7, 0xD6,
+	0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD5, 0xD5, 0xD5, 0xD5, 0xD5,
+	0xD5, 0xD5, 0xD5, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD4, 0xD3,
+	0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD3, 0xD2, 0xD2, 0xD2, 0xD2, 0xD2,
+	0xD2, 0xD2, 0xD2, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD1, 0xD0,
+	0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xD0, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF,
+	0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCF, 0xCE,
+	0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0xCE,
+	0xCE, 0xCE, 0xCE, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD,
+	0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCD, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC,
+	0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCB,
+	0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB,
+	0xCB, 0xCB, 0xCB, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA,
+	0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xCA, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9,
+	0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC9, 0xC8,
+	0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8, 0xC8,
+	0xC8, 0xC8, 0xC8, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7,
+	0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC7, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6,
+	0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC5,
+	0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5, 0xC5,
+	0xC5, 0xC5, 0xC5, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4,
+	0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC4, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3,
+	0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC2,
+	0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2, 0xC2,
+	0xC2, 0xC2, 0xC2, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1,
+	0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0,
+	0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xBF,
+	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF,
+	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF,
+	0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBF, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE,
+	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE,
+	0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE, 0xBE,
+	0xBE, 0xBE, 0xBE, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD,
+	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD,
+	0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBD, 0xBC,
+	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC,
+	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC,
+	0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBC, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
+	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
+	0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB,
+	0xBB, 0xBB, 0xBB, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA,
+	0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA,
+	0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xBA, 0xB9,
+	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9,
+	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9,
+	0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB9, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8,
+	0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8,
+	0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8, 0xB8,
+	0xB8, 0xB8, 0xB8, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7,
+	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7,
+	0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB7, 0xB6,
+	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6,
+	0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5,
+	0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5,
+	0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5, 0xB5,
+	0xB5, 0xB5, 0xB5, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4,
+	0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4,
+	0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB4, 0xB3,
+	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3,
+	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3,
+	0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB3, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2,
+	0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2,
+	0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2, 0xB2,
+	0xB2, 0xB2, 0xB2, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1,
+	0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1,
+	0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB1, 0xB0,
+	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0,
+	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0,
+	0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xB0, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF,
+	0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAF, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE, 0xAE,
+	0xAE, 0xAE, 0xAE, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD,
+	0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAD, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC,
+	0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAC, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB, 0xAB,
+	0xAB, 0xAB, 0xAB, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA,
+	0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9,
+	0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA9, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8, 0xA8,
+	0xA8, 0xA8, 0xA8, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7,
+	0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA7, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+	0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5,
+	0xA5, 0xA5, 0xA5, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4,
+	0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA4, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3,
+	0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA3, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2, 0xA2,
+	0xA2, 0xA2, 0xA2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1,
+	0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0,
+	0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0xA0, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F,
+	0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9F, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E, 0x9E,
+	0x9E, 0x9E, 0x9E, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D,
+	0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9D, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C,
+	0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9C, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B,
+	0x9B, 0x9B, 0x9B, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A,
+	0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x9A, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99,
+	0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98, 0x98,
+	0x98, 0x98, 0x98, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97,
+	0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x97, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96,
+	0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95, 0x95,
+	0x95, 0x95, 0x95, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94,
+	0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x94, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93,
+	0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x93, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91,
+	0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x91, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
+	0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F,
+	0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8F, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E, 0x8E,
+	0x8E, 0x8E, 0x8E, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D,
+	0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8D, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C,
+	0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8C, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B,
+	0x8B, 0x8B, 0x8B, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A,
+	0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89,
+	0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x89, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
+	0x88, 0x88, 0x88, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87,
+	0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x87, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86,
+	0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85,
+	0x85, 0x85, 0x85, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84,
+	0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
+	0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+	0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
 	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00
 } ;
 
@@ -741,17 +741,17 @@ static int from_ulaw(void* in, void* out
   // Make sure the input parametrs are OK
   if(format & (AF_FORMAT_SPECIAL_MASK | AF_FORMAT_US))
       return AF_ERROR;
-    
+
   // Convert to int or to float
   if((format & AF_FORMAT_POINT_MASK) == AF_FORMAT_I){
     switch(bps){
-    case(1): 
+    case(1):
       for(i=0;i<len;i++){
 	if(((int8_t*)in)[i] & 0x80)
 	  ((int8_t*)out)[i] = (-1 * ulaw_decode[(((int8_t*)in)[i]) & 0x7F]) >> 8;
 	else
 	  ((int8_t*)out)[i] = (ulaw_decode[(((int8_t*)in)[i]) & 0x7F]) >> 8;
-      } 
+      }
       break;
     case(2):
       for(i=0;i<len;i++){
@@ -759,7 +759,7 @@ static int from_ulaw(void* in, void* out
 	  ((int16_t*)out)[i] = -1 * ulaw_decode[(((int8_t*)in)[i]) & 0x7F];
 	else
 	  ((int16_t*)out)[i] = ulaw_decode[(((int8_t*)in)[i]) & 0x7F];
-      } 
+      }
       break;
     case(4):
       for(i=0;i<len;i++){
@@ -767,7 +767,7 @@ static int from_ulaw(void* in, void* out
 	  ((int32_t*)out)[i] = (-1 * ulaw_decode[(((int8_t*)in)[i]) & 0x7F]) << 16;
 	else
 	  ((int32_t*)out)[i] = (ulaw_decode[(((int8_t*)in)[i]) & 0x7F]) << 16;
-      } 
+      }
       break;
     default:
       return AF_ERROR;
@@ -791,11 +791,11 @@ static int to_ulaw(void* in, void* out, 
   // Make sure the input parametrs are OK
   if(format & (AF_FORMAT_SPECIAL_MASK | AF_FORMAT_US))
       return AF_ERROR;
-    
+
   // Convert from int or to float
   if((format & AF_FORMAT_POINT_MASK) == AF_FORMAT_I){
     switch(bps){
-    case(1): 
+    case(1):
       for(i=0;i<len;i++){
 	if(((int8_t*)in)[i] >= 0)
 	  ((int8_t*)out)[i] = ulaw_encode[((int8_t*)in)[i] << 6];
@@ -803,7 +803,7 @@ static int to_ulaw(void* in, void* out, 
 	  ((int8_t*)out)[i] = 0x7F & ulaw_encode[-((int8_t*)in)[i] << 6];
       }
       break;
-    case(2): 
+    case(2):
       for(i=0;i<len;i++){
 	if(((int16_t*)in)[i] >= 0)
 	  ((int8_t*)out)[i] = ulaw_encode[((int16_t*)in)[i] / 4];
@@ -811,7 +811,7 @@ static int to_ulaw(void* in, void* out, 
 	  ((int8_t*)out)[i] = 0x7F & ulaw_encode[((int16_t*)in)[i] / -4];
       }
       break;
-    case(4): 
+    case(4):
       for(i=0;i<len;i++){
 	if(((int32_t*)in)[i] >= 0)
 	  ((int8_t*)out)[i] = ulaw_encode[((int32_t*)in)[i] >> (16 + 2)];

Modified: trunk/libaf/af_gate.c
==============================================================================
--- trunk/libaf/af_gate.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_gate.c	Wed May 13 04:58:57 2009	(r29305)
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h> 
+#include <string.h>
 
 #include <inttypes.h>
 #include <math.h>
@@ -43,19 +43,19 @@ typedef struct af_gate_s
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_gate_t* s   = (af_gate_t*)af->setup; 
+  af_gate_t* s   = (af_gate_t*)af->setup;
   switch(cmd){
   case AF_CONTROL_REINIT:
     // Sanity check
     if(!arg) return AF_ERROR;
-    
+
     af->data->rate   = ((af_data_t*)arg)->rate;
     af->data->nch    = ((af_data_t*)arg)->nch;
     af->data->format = AF_FORMAT_FLOAT_NE;
     af->data->bps    = 4;
 
     // Time constant set to 0.1s
-    //    s->alpha = (1.0/0.2)/(2.0*M_PI*(float)((af_data_t*)arg)->rate); 
+    //    s->alpha = (1.0/0.2)/(2.0*M_PI*(float)((af_data_t*)arg)->rate);
     return af_test_output(af,(af_data_t*)arg);
   case AF_CONTROL_COMMAND_LINE:{
 /*     float v=-10.0; */
@@ -75,10 +75,10 @@ static int control(struct af_instance_s*
 
   case AF_CONTROL_GATE_ON_OFF | AF_CONTROL_SET:
     memcpy(s->enable,(int*)arg,AF_NCH*sizeof(int));
-    return AF_OK; 
+    return AF_OK;
   case AF_CONTROL_GATE_ON_OFF | AF_CONTROL_GET:
     memcpy((int*)arg,s->enable,AF_NCH*sizeof(int));
-    return AF_OK; 
+    return AF_OK;
   case AF_CONTROL_GATE_THRESH | AF_CONTROL_SET:
     return af_from_dB(AF_NCH,(float*)arg,s->tresh,20.0,-60.0,-1.0);
   case AF_CONTROL_GATE_THRESH | AF_CONTROL_GET:
@@ -99,7 +99,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -116,7 +116,7 @@ static af_data_t* play(struct af_instanc
   float*   	a   = (float*)c->audio;		// Audio data
   int       	len = c->len/4;			// Number of samples
   int           ch  = 0;			// Channel counter
-  register int	nch = c->nch;			// Number of channels	
+  register int	nch = c->nch;			// Number of channels
   register int  i   = 0;
 
 
@@ -126,8 +126,8 @@ static af_data_t* play(struct af_instanc
       float	t   = 1.0 - s->time[ch];
       for(i=ch;i<len;i+=nch){
 	register float x 	= a[i];
-	register float pow 	= x*x;	
-	s->pow[ch] = t*s->pow[ch] + 
+	register float pow 	= x*x;
+	s->pow[ch] = t*s->pow[ch] +
 	  pow*s->time[ch]; // LP filter
 	if(pow < s->pow[ch]){
 	  ;

Modified: trunk/libaf/af_hrtf.c
==============================================================================
--- trunk/libaf/af_hrtf.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_hrtf.c	Wed May 13 04:58:57 2009	(r29305)
@@ -75,7 +75,7 @@ typedef struct af_hrtf_s {
  *    nk:	length of the convolution kernel
  *    sx:	ring buffer
  *    sk:	convolution kernel
- *    offset:	offset on the ring buffer, can be 
+ *    offset:	offset on the ring buffer, can be
  */
 static float conv(const int nx, const int nk, const float *sx, const float *sk,
 		  const int offset)
@@ -338,7 +338,7 @@ static int control(struct af_instance_s 
 	}
 	s->print_flag = 1;
 	return AF_OK;
-    }    
+    }
 
     return AF_UNKNOWN;
 }
@@ -429,7 +429,7 @@ static af_data_t* play(struct af_instanc
 		 "[hrtf] bogus decode_mode: %d\n", s->decode_mode);
 	  break;
 	}
-	
+
        if(s->matrix_mode)
 	  mp_msg(MSGT_AFILTER, MSGL_INFO,
 		 "[hrtf] Using active matrix to decode rear center "
@@ -439,20 +439,20 @@ static af_data_t* play(struct af_instanc
     out = af->data->audio;
 
     /* MPlayer's 5 channel layout (notation for the variable):
-     * 
+     *
      * 0: L (LF), 1: R (RF), 2: Ls (LR), 3: Rs (RR), 4: C (CF), matrix
      * encoded: Cs (CR)
-     * 
+     *
      * or: L = left, C = center, R = right, F = front, R = rear
-     * 
+     *
      * Filter notation:
-     * 
+     *
      *      CF
      * OF        AF
      *      Ear->
      * OR        AR
      *      CR
-     * 
+     *
      * or: C = center, A = same side, O = opposite, F = front, R = rear
      */
 
@@ -667,7 +667,7 @@ static int af_open(af_instance_t* af)
     }
     for(i = 0; i < s->basslen; i++)
 	s->ba_ir[i] *= BASSGAIN;
-    
+
     return AF_OK;
 }
 

Modified: trunk/libaf/af_karaoke.c
==============================================================================
--- trunk/libaf/af_karaoke.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_karaoke.c	Wed May 13 04:58:57 2009	(r29305)
@@ -23,7 +23,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h> 
+#include <string.h>
 
 #include "af.h"
 
@@ -43,7 +43,7 @@ static int control(struct af_instance_s*
 	return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
 	if(af->data)
@@ -55,22 +55,22 @@ static af_data_t* play(struct af_instanc
 {
 	af_data_t*	c	= data;		 // Current working data
 	float*		a	= c->audio;	 // Audio data
-	int			len	= c->len/4;	 // Number of samples in current audio block 
+	int			len	= c->len/4;	 // Number of samples in current audio block
 	int			nch	= c->nch;	 // Number of channels
 	register int  i;
 
-	/*	  
-		FIXME1 add a low band pass filter to avoid suppressing 
+	/*
+		FIXME1 add a low band pass filter to avoid suppressing
 		centered bass/drums
 		FIXME2 better calculated* attenuation factor
 	*/
-	
+
 	for(i=0;i<len;i+=nch)
 	{
 		a[i] = (a[i] - a[i+1]) * 0.7;
 		a[i+1]=a[i];
 	}
-	
+
 	return c;
 }
 
@@ -84,7 +84,7 @@ static int af_open(af_instance_t* af){
 
 	if(af->data == NULL)
 		return AF_ERROR;
-	
+
 	return AF_OK;
 }
 

Modified: trunk/libaf/af_ladspa.c
==============================================================================
--- trunk/libaf/af_ladspa.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_ladspa.c	Wed May 13 04:58:57 2009	(r29305)
@@ -212,7 +212,7 @@ static int af_ladspa_parse_plugin(af_lad
     }
 
     if (setup->ninputs == 0) {
-        mp_msg(MSGT_AFILTER, MSGL_WARN, "%s: %s\n", setup->myname, 
+        mp_msg(MSGT_AFILTER, MSGL_WARN, "%s: %s\n", setup->myname,
                                                 MSGTR_AF_LADSPA_WarnNoInputs);
     } else if (setup->ninputs == 1) {
         mp_msg(MSGT_AFILTER, MSGL_V, "%s: this is a mono effect\n", setup->myname);
@@ -281,7 +281,7 @@ static int af_ladspa_parse_plugin(af_lad
  * filename (with or without the addition of the .so extension) in various
  * directories specified by the LADSPA_PATH environment variable. If all fails
  * it tries the filename directly as an absolute path to the library.
- * 
+ *
  * \param filename  filename of the library to load.
  * \param flag      see dlopen(3) for a description of the flags.
  *
@@ -411,7 +411,7 @@ static int af_ladspa_load_plugin(af_lads
     /* if label == help, list all labels in library and exit */
 
     if (strcmp(setup->label, "help") == 0) {
-        mp_msg(MSGT_AFILTER, MSGL_INFO, "%s: %s %s:\n", setup->myname, 
+        mp_msg(MSGT_AFILTER, MSGL_INFO, "%s: %s %s:\n", setup->myname,
                 MSGTR_AF_LADSPA_AvailableLabels, setup->file);
         for (i=0; ; i++) {
             ladspa_descriptor = descriptor_function(i);
@@ -558,7 +558,7 @@ static int control(struct af_instance_s 
         mp_msg(MSGT_AFILTER, MSGL_V, "%s: label --> %s\n", setup->myname,
                                                                 setup->label);
 /*        if (*(char*)arg != '0') arg++; */ /* read ':' */
- 
+
         free(buf); /* no longer needed */
 
         /* set new setup->myname */
@@ -716,7 +716,7 @@ static void uninit(struct af_instance_s 
 /* ------------------------------------------------------------------------- */
 
 /** \brief Process chunk of audio data through the selected LADSPA Plugin.
- * 
+ *
  * \param af    Pointer to audio filter instance
  * \param data  Pointer to chunk of audio data
  *
@@ -730,7 +730,7 @@ static af_data_t* play(struct af_instanc
     int nsamples = data->len/4; /* /4 because it's 32-bit float */
     int nch = data->nch;
     int rate = data->rate;
-    int i, p; 
+    int i, p;
 
     if (setup->status !=AF_OK)
         return data;
@@ -845,7 +845,7 @@ static af_data_t* play(struct af_instanc
          * and right. connect it to the second port.
          */
 
-        for (p = i; p % setup->ninputs; p++) { 
+        for (p = i; p % setup->ninputs; p++) {
             pdes->connect_port(setup->chhandles[i-1],
                                setup->inputs[p % setup->ninputs],
                                setup->inbufs[i-1]);

Modified: trunk/libaf/af_lavcresample.c
==============================================================================
--- trunk/libaf/af_lavcresample.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_lavcresample.c	Wed May 13 04:58:57 2009	(r29305)
@@ -34,7 +34,7 @@ typedef struct af_resample_s{
     int16_t *in[AF_NCH];
     int in_alloc;
     int index;
-    
+
     int filter_length;
     int linear;
     int phase_shift;
@@ -45,7 +45,7 @@ typedef struct af_resample_s{
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_resample_t* s   = (af_resample_t*)af->setup; 
+  af_resample_t* s   = (af_resample_t*)af->setup;
   af_data_t *data= (af_data_t*)arg;
   int out_rate, test_output_res; // helpers for checking input format
 
@@ -83,7 +83,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
     if(af->data)
@@ -101,7 +101,7 @@ static void uninit(struct af_instance_s*
 
 // Filter data through filter
 static af_data_t* play(struct af_instance_s* af, af_data_t* data)
-{    
+{
   af_resample_t *s = af->setup;
   int i, j, consumed, ret;
   int16_t *in = (int16_t*)data->audio;
@@ -110,14 +110,14 @@ static af_data_t* play(struct af_instanc
   int in_len  = data->len/(2*chans);
   int out_len = in_len * af->mul + 10;
   int16_t tmp[AF_NCH][out_len];
-    
+
   if(AF_OK != RESIZE_LOCAL_BUFFER(af,data))
       return NULL;
-  
+
   out= (int16_t*)af->data->audio;
-  
+
   out_len= min(out_len, af->data->len/(2*chans));
-  
+
   if(s->in_alloc < in_len + s->index){
       s->in_alloc= in_len + s->index;
       for(i=0; i<chans; i++){
@@ -145,7 +145,7 @@ static af_data_t* play(struct af_instanc
       ret= av_resample(s->avrctx, tmp[i], s->in[i], &consumed, in_len, out_len, i+1 == chans);
   }
   out_len= ret;
-  
+
   s->index= in_len - consumed;
   for(i=0; i<chans; i++){
       memmove(s->in[i], s->in[i] + consumed, s->index*sizeof(int16_t));

Modified: trunk/libaf/af_pan.c
==============================================================================
--- trunk/libaf/af_pan.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_pan.c	Wed May 13 04:58:57 2009	(r29305)
@@ -37,7 +37,7 @@ typedef struct af_pan_s
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_pan_t* s = af->setup; 
+  af_pan_t* s = af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:
@@ -50,7 +50,7 @@ static int control(struct af_instance_s*
     af->data->nch    = s->nch ? s->nch: ((af_data_t*)arg)->nch;
     af->mul          = (double)af->data->nch / ((af_data_t*)arg)->nch;
 
-    if((af->data->format != ((af_data_t*)arg)->format) || 
+    if((af->data->format != ((af_data_t*)arg)->format) ||
        (af->data->bps != ((af_data_t*)arg)->bps)){
       ((af_data_t*)arg)->format = af->data->format;
       ((af_data_t*)arg)->bps = af->data->bps;
@@ -72,12 +72,12 @@ static int control(struct af_instance_s*
     j = 0; k = 0;
     while((*cp == ':') && (k < AF_NCH)){
       sscanf(cp, ":%f%n" , &s->level[j][k], &n);
-      mp_msg(MSGT_AFILTER, MSGL_V, "[pan] Pan level from channel %i to" 
+      mp_msg(MSGT_AFILTER, MSGL_V, "[pan] Pan level from channel %i to"
 	     " channel %i = %f\n",k,j,s->level[j][k]);
       cp =&cp[n];
       j++;
       if(j>=nch){
-	j = 0; 
+	j = 0;
 	k++;
       }
     }
@@ -108,7 +108,7 @@ static int control(struct af_instance_s*
 
     // Sanity check
     if(((int*)arg)[0] <= 0 || ((int*)arg)[0] > AF_NCH){
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[pan] The number of output channels must be" 
+      mp_msg(MSGT_AFILTER, MSGL_ERR, "[pan] The number of output channels must be"
 	     " between 1 and %i. Current value is %i\n",AF_NCH,((int*)arg)[0]);
       return AF_ERROR;
     }
@@ -138,7 +138,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -165,7 +165,7 @@ static af_data_t* play(struct af_instanc
     return NULL;
 
   out = l->audio;
-  // Execute panning 
+  // Execute panning
   // FIXME: Too slow
   while(in < end){
     for(j=0;j<ncho;j++){

Modified: trunk/libaf/af_resample.c
==============================================================================
--- trunk/libaf/af_resample.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_resample.c	Wed May 13 04:58:57 2009	(r29305)
@@ -34,11 +34,11 @@
    length of the filter. This definition affects the computational
    complexity (see play()), the performance (see filter.h) and the
    memory usage. The filter length is chosen to 8 if the machine is
-   slow and to 16 if the machine is fast and has MMX.  
+   slow and to 16 if the machine is fast and has MMX.
 */
 
 #if !HAVE_MMX // This machine is slow
-#define L8 
+#define L8
 #else
 #define L16
 #endif
@@ -47,7 +47,7 @@
 
 // Filtering types
 #define RSMP_LIN   	(0<<0)	// Linear interpolation
-#define RSMP_INT   	(1<<0)  // 16 bit integer 
+#define RSMP_INT   	(1<<0)  // 16 bit integer
 #define RSMP_FLOAT	(2<<0)	// 32 bit floating point
 #define RSMP_MASK	(3<<0)
 
@@ -66,9 +66,9 @@ typedef struct af_resample_s
   void** 	xq; 	// Circular buffers
   uint32_t	xi; 	// Index for circular buffers
   uint32_t	wi;	// Index for w
-  uint32_t	i; 	// Number of new samples to put in x queue 
+  uint32_t	i; 	// Number of new samples to put in x queue
   uint32_t  	dn;     // Down sampling factor
-  uint32_t	up;	// Up sampling factor 
+  uint32_t	up;	// Up sampling factor
   uint64_t	step;	// Step size for linear interpolation
   uint64_t	pt;	// Pointer remainder for linear interpolation
   int		setup;	// Setup parameters cmdline or through postcreate
@@ -79,7 +79,7 @@ static int linint(af_data_t* c,af_data_t
 {
   uint32_t	len   = 0; 		// Number of input samples
   uint32_t	nch   = l->nch;   	// Words pre transfer
-  uint64_t	step  = s->step; 
+  uint64_t	step  = s->step;
   int16_t*	in16  = ((int16_t*)c->audio);
   int16_t*	out16 = ((int16_t*)l->audio);
   int32_t*	in32  = ((int32_t*)c->audio);
@@ -87,35 +87,35 @@ static int linint(af_data_t* c,af_data_t
   uint64_t 	end   = ((((uint64_t)c->len)/2LL)<<STEPACCURACY);
   uint64_t	pt    = s->pt;
   uint16_t 	tmp;
-  
+
   switch (nch){
   case 1:
     while(pt < end){
-      out16[len++]=in16[pt>>STEPACCURACY];    	    
+      out16[len++]=in16[pt>>STEPACCURACY];
       pt+=step;
     }
     s->pt=pt & ((1LL<<STEPACCURACY)-1);
-    break;		
+    break;
   case 2:
     end/=2;
     while(pt < end){
-      out32[len++]=in32[pt>>STEPACCURACY];    	    
+      out32[len++]=in32[pt>>STEPACCURACY];
       pt+=step;
     }
     len=(len<<1);
     s->pt=pt & ((1LL<<STEPACCURACY)-1);
     break;
-  default:	
+  default:
     end /=nch;
     while(pt < end){
       tmp=nch;
-      do {	 
-	tmp--;   
-	out16[len+tmp]=in16[tmp+(pt>>STEPACCURACY)*nch];    	    
+      do {
+	tmp--;
+	out16[len+tmp]=in16[tmp+(pt>>STEPACCURACY)*nch];
       } while (tmp);
       len+=nch;
       pt+=step;
-    }	
+    }
     s->pt=pt & ((1LL<<STEPACCURACY)-1);
   }
   return len;
@@ -128,13 +128,13 @@ static int set_types(struct af_instance_
   int rv = AF_OK;
   float rd = 0;
 
-  // Make sure this filter isn't redundant 
+  // Make sure this filter isn't redundant
   if((af->data->rate == data->rate) || (af->data->rate == 0))
     return AF_DETACH;
   /* If sloppy and small resampling difference (2%) */
   rd = abs((float)af->data->rate - (float)data->rate)/(float)data->rate;
-  if((((s->setup & FREQ_MASK) == FREQ_SLOPPY) && (rd < 0.02) && 
-      (data->format != (AF_FORMAT_FLOAT_NE))) || 
+  if((((s->setup & FREQ_MASK) == FREQ_SLOPPY) && (rd < 0.02) &&
+      (data->format != (AF_FORMAT_FLOAT_NE))) ||
      ((s->setup & RSMP_MASK) == RSMP_LIN)){
     s->setup = (s->setup & ~RSMP_MASK) | RSMP_LIN;
     af->data->format = AF_FORMAT_S16_NE;
@@ -144,7 +144,7 @@ static int set_types(struct af_instance_
   else{
     /* If the input format is float or if float is explicitly selected
        use float, otherwise use int */
-    if((data->format == (AF_FORMAT_FLOAT_NE)) || 
+    if((data->format == (AF_FORMAT_FLOAT_NE)) ||
        ((s->setup & RSMP_MASK) == RSMP_FLOAT)){
       s->setup = (s->setup & ~RSMP_MASK) | RSMP_FLOAT;
       af->data->format = AF_FORMAT_FLOAT_NE;
@@ -174,7 +174,7 @@ static int control(struct af_instance_s*
 {
   switch(cmd){
   case AF_CONTROL_REINIT:{
-    af_resample_t* s   = af->setup; 
+    af_resample_t* s   = af->setup;
     af_data_t* 	   n   = arg; // New configuration
     int            i,d = 0;
     int 	   rv  = AF_OK;
@@ -188,8 +188,8 @@ static int control(struct af_instance_s*
 
     if(AF_DETACH == (rv = set_types(af,n)))
       return AF_DETACH;
-    
-    // If linear interpolation 
+
+    // If linear interpolation
     if((s->setup & RSMP_MASK) == RSMP_LIN){
       s->pt=0LL;
       s->step=((uint64_t)n->rate<<STEPACCURACY)/(uint64_t)af->data->rate+1LL;
@@ -227,11 +227,11 @@ static int control(struct af_instance_s*
       float* wt;
       float fc;
       int j;
-      s->up = af->data->rate/d;	
+      s->up = af->data->rate/d;
       s->dn = n->rate/d;
       s->wi = 0;
       s->i = 0;
-      
+
       // Calculate cutoff frequency for filter
       fc = 1/(float)(max(s->up,s->dn));
       // Allocate space for polyphase filter bank and prototype filter
@@ -241,7 +241,7 @@ static int control(struct af_instance_s*
       s->w = malloc(L*s->up*af->data->bps);
 
       // Design prototype filter type using Kaiser window with beta = 10
-      if(NULL == w || NULL == s->w || 
+      if(NULL == w || NULL == s->w ||
 	 -1 == af_filter_design_fir(s->up*L, w, &fc, LP|KAISER , 10.0)){
 	mp_msg(MSGT_AFILTER, MSGL_ERR, "[resample] Unable to design prototype filter.\n");
 	return AF_ERROR;
@@ -270,39 +270,39 @@ static int control(struct af_instance_s*
     return rv;
   }
   case AF_CONTROL_COMMAND_LINE:{
-    af_resample_t* s   = af->setup; 
+    af_resample_t* s   = af->setup;
     int rate=0;
     int type=RSMP_INT;
     int sloppy=1;
     sscanf((char*)arg,"%i:%i:%i", &rate, &sloppy, &type);
-    s->setup = (sloppy?FREQ_SLOPPY:FREQ_EXACT) | 
+    s->setup = (sloppy?FREQ_SLOPPY:FREQ_EXACT) |
       (clamp(type,RSMP_LIN,RSMP_FLOAT));
     return af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, &rate);
   }
-  case AF_CONTROL_POST_CREATE:	
+  case AF_CONTROL_POST_CREATE:
     if((((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) == AF_INIT_FLOAT)
       ((af_resample_t*)af->setup)->setup = RSMP_FLOAT;
     return AF_OK;
-  case AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET: 
+  case AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET:
     // Reinit must be called after this function has been called
-    
+
     // Sanity check
     if(((int*)arg)[0] < 8000 || ((int*)arg)[0] > 192000){
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[resample] The output sample frequency " 
+      mp_msg(MSGT_AFILTER, MSGL_ERR, "[resample] The output sample frequency "
 	     "must be between 8kHz and 192kHz. Current value is %i \n",
 	     ((int*)arg)[0]);
       return AF_ERROR;
     }
 
-    af->data->rate=((int*)arg)[0]; 
-    mp_msg(MSGT_AFILTER, MSGL_V, "[resample] Changing sample rate "  
+    af->data->rate=((int*)arg)[0];
+    mp_msg(MSGT_AFILTER, MSGL_V, "[resample] Changing sample rate "
 	   "to %iHz\n",af->data->rate);
     return AF_OK;
   }
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   af_resample_t *s = af->setup;
@@ -335,7 +335,7 @@ static af_data_t* play(struct af_instanc
     if(s->up>s->dn){
 #     define UP
 #     include "af_resample_template.c"
-#     undef UP 
+#     undef UP
     }
     else{
 #     define DN
@@ -349,7 +349,7 @@ static af_data_t* play(struct af_instanc
     if(s->up>s->dn){
 #     define UP
 #     include "af_resample_template.c"
-#     undef UP 
+#     undef UP
     }
     else{
 #     define DN
@@ -366,7 +366,7 @@ static af_data_t* play(struct af_instanc
   c->audio = l->audio;
   c->len   = len*l->bps;
   c->rate  = l->rate;
-  
+
   return c;
 }
 

Modified: trunk/libaf/af_resample_template.c
==============================================================================
--- trunk/libaf/af_resample_template.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_resample_template.c	Wed May 13 04:58:57 2009	(r29305)
@@ -21,8 +21,8 @@
 /* This file contains the resampling engine, the sample format is
    controlled by the FORMAT parameter, the filter length by the L
    parameter and the resampling type by UP and DN. This file should
-   only be included by af_resample.c 
-*/ 
+   only be included by af_resample.c
+*/
 
 #undef L
 #undef SHIFT
@@ -46,16 +46,16 @@
 #if defined(FORMAT_I)
 #define SHIFT >>16
 #define FORMAT int16_t
-#else 
+#else
 #define SHIFT
 #define FORMAT float
 #endif
 
 // Short filter
-#if defined(L8) 
+#if defined(L8)
 
 #define L   	8	// Filter length
-// Unrolled loop to speed up execution 
+// Unrolled loop to speed up execution
 #define FIR(x,w,y) \
   (y[0])  = ( w[0]*x[0]+w[1]*x[1]+w[2]*x[2]+w[3]*x[3] \
             + w[4]*x[4]+w[5]*x[5]+w[6]*x[6]+w[7]*x[7] ) SHIFT
@@ -65,7 +65,7 @@
 #else  /* L8/L16 */
 
 #define L   	16
-// Unrolled loop to speed up execution 
+// Unrolled loop to speed up execution
 #define FIR(x,w,y) \
   y[0] = ( w[0] *x[0] +w[1] *x[1] +w[2] *x[2] +w[3] *x[3] \
          + w[4] *x[4] +w[5] *x[5] +w[6] *x[6] +w[7] *x[7] \
@@ -74,7 +74,7 @@
 
 #endif /* L8/L16 */
 
-// Macro to add data to circular que 
+// Macro to add data to circular que
 #define ADDQUE(xi,xq,in)\
   xq[xi]=xq[(xi)+L]=*(in);\
   xi=((xi)-1)&(L-1);
@@ -83,15 +83,15 @@
 
   uint32_t		ci    = l->nch; 	// Index for channels
   uint32_t		nch   = l->nch;   	// Number of channels
-  uint32_t		inc   = s->up/s->dn; 
-  uint32_t		level = s->up%s->dn; 
+  uint32_t		inc   = s->up/s->dn;
+  uint32_t		level = s->up%s->dn;
   uint32_t		up    = s->up;
   uint32_t		dn    = s->dn;
   uint32_t		ns    = c->len/l->bps;
   register FORMAT*	w     = s->w;
 
   register uint32_t	wi    = 0;
-  register uint32_t	xi    = 0; 
+  register uint32_t	xi    = 0;
 
   // Index current channel
   while(ci--){
@@ -126,8 +126,8 @@
 #if defined(DN) /* DN */
   uint32_t		ci    = l->nch; 	// Index for channels
   uint32_t		nch   = l->nch;   	// Number of channels
-  uint32_t		inc   = s->dn/s->up; 
-  uint32_t		level = s->dn%s->up; 
+  uint32_t		inc   = s->dn/s->up;
+  uint32_t		level = s->dn%s->up;
   uint32_t		up    = s->up;
   uint32_t		dn    = s->dn;
   uint32_t		ns    = c->len/l->bps;
@@ -136,7 +136,7 @@
   register int32_t	i     = 0;
   register uint32_t	wi    = 0;
   register uint32_t	xi    = 0;
-  
+
   // Index current channel
   while(ci--){
     // Temporary pointers
@@ -156,7 +156,7 @@
 	len++;	out+=nch;
 
 	// Update wi to point at the correct polyphase component
-	wi=(wi+dn)%up;  
+	wi=(wi+dn)%up;
 
 	// Insert i number of new samples in queue
 	i = inc;

Modified: trunk/libaf/af_sinesuppress.c
==============================================================================
--- trunk/libaf/af_sinesuppress.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_sinesuppress.c	Wed May 13 04:58:57 2009	(r29305)
@@ -22,7 +22,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h> 
+#include <string.h>
 
 #include <inttypes.h>
 #include <math.h>
@@ -47,13 +47,13 @@ static af_data_t* play_s16(struct af_ins
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_sinesuppress_t* s   = (af_sinesuppress_t*)af->setup; 
+  af_sinesuppress_t* s   = (af_sinesuppress_t*)af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:{
     // Sanity check
     if(!arg) return AF_ERROR;
-    
+
     af->data->rate   = ((af_data_t*)arg)->rate;
     af->data->nch    = 1;
 #if 0
@@ -95,7 +95,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -111,7 +111,7 @@ static af_data_t* play_s16(struct af_ins
   register int i = 0;
   int16_t *a = (int16_t*)data->audio;	// Audio data
   int len = data->len/2;		// Number of samples
-  
+
   for (i = 0; i < len; i++)
   {
     double co= cos(s->pos);
@@ -143,14 +143,14 @@ static af_data_t* play_float(struct af_i
   float *a = (float*)data->audio;	// Audio data
   int len = data->len/4;		// Number of samples
   float avg, l, r;
-  
+
   for (i = 0; i < len; i+=2)
   {
     avg = (a[i] + a[i + 1]) / 2;
-    
+
 /*    l = avg + (s->mul * (a[i] - avg));
     r = avg + (s->mul * (a[i + 1] - avg));*/
-    
+
     a[i] = af_softclip(l);
     a[i + 1] = af_softclip(r);
   }

Modified: trunk/libaf/af_sub.c
==============================================================================
--- trunk/libaf/af_sub.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_sub.c	Wed May 13 04:58:57 2009	(r29305)
@@ -30,7 +30,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h> 
+#include <string.h>
 
 #include "af.h"
 #include "dsp.h"
@@ -38,7 +38,7 @@
 // Q value for low-pass filter
 #define Q 1.0
 
-// Analog domain biquad section 
+// Analog domain biquad section
 typedef struct{
   float a[3];		// Numerator coefficients
   float b[3];		// Denominator coefficients
@@ -56,13 +56,13 @@ typedef struct af_sub_s
   float	fc;		// Cutoff frequency [Hz] for low-pass filter
   float k;		// Filter gain;
   int ch;		// Channel number which to insert the filtered data
-  
+
 }af_sub_t;
 
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_sub_t* s   = af->setup; 
+  af_sub_t* s   = af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:{
@@ -120,7 +120,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -146,7 +146,7 @@ static af_data_t* play(struct af_instanc
   af_data_t*    c   = data;	 // Current working data
   af_sub_t*  	s   = af->setup; // Setup for this instance
   float*   	a   = c->audio;	 // Audio data
-  int		len = c->len/4;	 // Number of samples in current audio block 
+  int		len = c->len/4;	 // Number of samples in current audio block
   int		nch = c->nch;	 // Number of channels
   int		ch  = s->ch;	 // Channel in which to insert the sub audio
   register int  i;

Modified: trunk/libaf/af_surround.c
==============================================================================
--- trunk/libaf/af_surround.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_surround.c	Wed May 13 04:58:57 2009	(r29305)
@@ -118,14 +118,14 @@ static int control(struct af_instance_s*
     s->dr = calloc(LD,af->data->bps);
     if((NULL == s->dl) || (NULL == s->dr))
       mp_msg(MSGT_AFILTER, MSGL_FATAL, "[delay] Out of memory\n");
-    
+
     // Initialize delay queue index
     if(AF_OK != af_from_ms(1, &s->d, &s->wi, af->data->rate, 0.0, 1000.0))
       return AF_ERROR;
 //    printf("%i\n",s->wi);
     s->ri = 0;
 
-    if((af->data->format != ((af_data_t*)arg)->format) || 
+    if((af->data->format != ((af_data_t*)arg)->format) ||
        (af->data->bps    != ((af_data_t*)arg)->bps)){
       ((af_data_t*)arg)->format = af->data->format;
       ((af_data_t*)arg)->bps = af->data->bps;
@@ -171,7 +171,7 @@ static float steering_matrix[][12] = {
 // Filter data through filter
 static af_data_t* play(struct af_instance_s* af, af_data_t* data){
   af_surround_t* s   = (af_surround_t*)af->setup;
-  float*	 m   = steering_matrix[0]; 
+  float*	 m   = steering_matrix[0];
   float*     	 in  = data->audio; 	// Input audio data
   float*     	 out = NULL;		// Output audio data
   float*	 end = in + data->len / sizeof(float); // Loop end
@@ -236,10 +236,10 @@ static af_data_t* play(struct af_instanc
 #endif
 
     // Next sample...
-    in = &in[data->nch];  
+    in = &in[data->nch];
     out = &out[af->data->nch];
   }
-  
+
   // Save indexes
   s->i  = i; s->ri = ri; s->wi = wi;
 

Modified: trunk/libaf/af_sweep.c
==============================================================================
--- trunk/libaf/af_sweep.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_sweep.c	Wed May 13 04:58:57 2009	(r29305)
@@ -36,7 +36,7 @@ typedef struct af_sweep_s{
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_sweept* s   = (af_sweept*)af->setup; 
+  af_sweept* s   = (af_sweept*)af->setup;
   af_data_t *data= (af_data_t*)arg;
 
   switch(cmd){
@@ -57,7 +57,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
     if(af->data)
@@ -70,7 +70,7 @@ static void uninit(struct af_instance_s*
 
 // Filter data through filter
 static af_data_t* play(struct af_instance_s* af, af_data_t* data)
-{    
+{
   af_sweept *s = af->setup;
   int i, j;
   int16_t *in = (int16_t*)data->audio;

Modified: trunk/libaf/af_tools.c
==============================================================================
--- trunk/libaf/af_tools.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_tools.c	Wed May 13 04:58:57 2009	(r29305)
@@ -17,16 +17,16 @@
  */
 
 #include <math.h>
-#include <string.h> 
+#include <string.h>
 #include "af.h"
 
 /* Convert to gain value from dB. Returns AF_OK if of and AF_ERROR if
    fail */
 int af_from_dB(int n, float* in, float* out, float k, float mi, float ma)
 {
-  int i = 0; 
+  int i = 0;
   // Sanity check
-  if(!in || !out) 
+  if(!in || !out)
     return AF_ERROR;
 
   for(i=0;i<n;i++){
@@ -42,9 +42,9 @@ int af_from_dB(int n, float* in, float* 
    fail */
 int af_to_dB(int n, float* in, float* out, float k)
 {
-  int i = 0; 
+  int i = 0;
   // Sanity check
-  if(!in || !out) 
+  if(!in || !out)
     return AF_ERROR;
 
   for(i=0;i<n;i++){
@@ -59,9 +59,9 @@ int af_to_dB(int n, float* in, float* ou
 /* Convert from ms to sample time */
 int af_from_ms(int n, float* in, int* out, int rate, float mi, float ma)
 {
-  int i = 0; 
+  int i = 0;
   // Sanity check
-  if(!in || !out) 
+  if(!in || !out)
     return AF_ERROR;
 
   for(i=0;i<n;i++)
@@ -73,21 +73,21 @@ int af_from_ms(int n, float* in, int* ou
 /* Convert from sample time to ms */
 int af_to_ms(int n, int* in, float* out, int rate)
 {
-  int i = 0; 
+  int i = 0;
   // Sanity check
-  if(!in || !out || !rate) 
+  if(!in || !out || !rate)
     return AF_ERROR;
 
   for(i=0;i<n;i++)
     out[i]=1000.0 * (float)in[i]/((float)rate);
-  
+
   return AF_OK;
 }
 
 /* Helper function for testing the output format */
 int af_test_output(struct af_instance_s* af, af_data_t* out)
 {
-  if((af->data->format != out->format) || 
+  if((af->data->format != out->format) ||
      (af->data->bps    != out->bps)    ||
      (af->data->rate   != out->rate)   ||
      (af->data->nch    != out->nch)){

Modified: trunk/libaf/af_volnorm.c
==============================================================================
--- trunk/libaf/af_volnorm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_volnorm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h> 
+#include <string.h>
 
 #include <inttypes.h>
 #include <math.h>
@@ -80,16 +80,16 @@ typedef struct af_volume_s
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_volnorm_t* s   = (af_volnorm_t*)af->setup; 
+  af_volnorm_t* s   = (af_volnorm_t*)af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:
     // Sanity check
     if(!arg) return AF_ERROR;
-    
+
     af->data->rate   = ((af_data_t*)arg)->rate;
     af->data->nch    = ((af_data_t*)arg)->nch;
-    
+
     if(((af_data_t*)arg)->format == (AF_FORMAT_S16_NE)){
       af->data->format = AF_FORMAT_S16_NE;
       af->data->bps    = 2;
@@ -113,7 +113,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -129,26 +129,26 @@ static void method1_int16(af_volnorm_t *
   int len = c->len/2;		// Number of samples
   float curavg = 0.0, newavg, neededmul;
   int tmp;
-  
+
   for (i = 0; i < len; i++)
   {
     tmp = data[i];
     curavg += tmp * tmp;
   }
   curavg = sqrt(curavg / (float) len);
-  
+
   // Evaluate an adequate 'mul' coefficient based on previous state, current
   // samples level, etc
-  
+
   if (curavg > SIL_S16)
   {
     neededmul = s->mid_s16 / (curavg * s->mul);
     s->mul = (1.0 - SMOOTH_MUL) * s->mul + SMOOTH_MUL * neededmul;
-    
+
     // clamp the mul coefficient
     s->mul = clamp(s->mul, MUL_MIN, MUL_MAX);
   }
-  
+
   // Scale & clamp the samples
   for (i = 0; i < len; i++)
   {
@@ -156,10 +156,10 @@ static void method1_int16(af_volnorm_t *
     tmp = clamp(tmp, SHRT_MIN, SHRT_MAX);
     data[i] = tmp;
   }
-  
+
   // Evaulation of newavg (not 100% accurate because of values clamping)
   newavg = s->mul * curavg;
-  
+
   // Stores computed values for future smoothing
   s->lastavg = (1.0 - SMOOTH_LASTAVG) * s->lastavg + SMOOTH_LASTAVG * newavg;
 }
@@ -170,33 +170,33 @@ static void method1_float(af_volnorm_t *
   float *data = (float*)c->audio;	// Audio data
   int len = c->len/4;		// Number of samples
   float curavg = 0.0, newavg, neededmul, tmp;
-  
+
   for (i = 0; i < len; i++)
   {
     tmp = data[i];
     curavg += tmp * tmp;
   }
   curavg = sqrt(curavg / (float) len);
-  
+
   // Evaluate an adequate 'mul' coefficient based on previous state, current
   // samples level, etc
-  
+
   if (curavg > SIL_FLOAT) // FIXME
   {
     neededmul = s->mid_float / (curavg * s->mul);
     s->mul = (1.0 - SMOOTH_MUL) * s->mul + SMOOTH_MUL * neededmul;
-    
+
     // clamp the mul coefficient
     s->mul = clamp(s->mul, MUL_MIN, MUL_MAX);
   }
-  
+
   // Scale & clamp the samples
   for (i = 0; i < len; i++)
     data[i] *= s->mul;
-  
+
   // Evaulation of newavg (not 100% accurate because of values clamping)
   newavg = s->mul * curavg;
-  
+
   // Stores computed values for future smoothing
   s->lastavg = (1.0 - SMOOTH_LASTAVG) * s->lastavg + SMOOTH_LASTAVG * newavg;
 }
@@ -208,14 +208,14 @@ static void method2_int16(af_volnorm_t *
   int len = c->len/2;		// Number of samples
   float curavg = 0.0, newavg, avg = 0.0;
   int tmp, totallen = 0;
-  
+
   for (i = 0; i < len; i++)
   {
     tmp = data[i];
     curavg += tmp * tmp;
   }
   curavg = sqrt(curavg / (float) len);
-  
+
   // Evaluate an adequate 'mul' coefficient based on previous state, current
   // samples level, etc
   for (i = 0; i < NSAMPLES; i++)
@@ -223,7 +223,7 @@ static void method2_int16(af_volnorm_t *
     avg += s->mem[i].avg * (float)s->mem[i].len;
     totallen += s->mem[i].len;
   }
-  
+
   if (totallen > MIN_SAMPLE_SIZE)
   {
     avg /= (float)totallen;
@@ -233,7 +233,7 @@ static void method2_int16(af_volnorm_t *
 	s->mul = clamp(s->mul, MUL_MIN, MUL_MAX);
     }
   }
-  
+
   // Scale & clamp the samples
   for (i = 0; i < len; i++)
   {
@@ -241,10 +241,10 @@ static void method2_int16(af_volnorm_t *
     tmp = clamp(tmp, SHRT_MIN, SHRT_MAX);
     data[i] = tmp;
   }
-  
+
   // Evaulation of newavg (not 100% accurate because of values clamping)
   newavg = s->mul * curavg;
-  
+
   // Stores computed values for future smoothing
   s->mem[s->idx].len = len;
   s->mem[s->idx].avg = newavg;
@@ -258,14 +258,14 @@ static void method2_float(af_volnorm_t *
   int len = c->len/4;		// Number of samples
   float curavg = 0.0, newavg, avg = 0.0, tmp;
   int totallen = 0;
-  
+
   for (i = 0; i < len; i++)
   {
     tmp = data[i];
     curavg += tmp * tmp;
   }
   curavg = sqrt(curavg / (float) len);
-  
+
   // Evaluate an adequate 'mul' coefficient based on previous state, current
   // samples level, etc
   for (i = 0; i < NSAMPLES; i++)
@@ -273,7 +273,7 @@ static void method2_float(af_volnorm_t *
     avg += s->mem[i].avg * (float)s->mem[i].len;
     totallen += s->mem[i].len;
   }
-  
+
   if (totallen > MIN_SAMPLE_SIZE)
   {
     avg /= (float)totallen;
@@ -283,14 +283,14 @@ static void method2_float(af_volnorm_t *
 	s->mul = clamp(s->mul, MUL_MIN, MUL_MAX);
     }
   }
-  
+
   // Scale & clamp the samples
   for (i = 0; i < len; i++)
     data[i] *= s->mul;
-  
+
   // Evaulation of newavg (not 100% accurate because of values clamping)
   newavg = s->mul * curavg;
-  
+
   // Stores computed values for future smoothing
   s->mem[s->idx].len = len;
   s->mem[s->idx].avg = newavg;
@@ -310,7 +310,7 @@ static af_data_t* play(struct af_instanc
 	method1_int16(s, data);
   }
   else if(af->data->format == (AF_FORMAT_FLOAT_NE))
-  { 
+  {
     if (s->method)
 	method2_float(s, data);
     else

Modified: trunk/libaf/af_volume.c
==============================================================================
--- trunk/libaf/af_volume.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/af_volume.c	Wed May 13 04:58:57 2009	(r29305)
@@ -31,12 +31,12 @@
    probing is enable by AF_CONTROL_VOLUME_PROBE_ON_OFF and is done on a
    per channel basis. The result from the probing is obtained using
    AF_CONTROL_VOLUME_PROBE_GET and AF_CONTROL_VOLUME_PROBE_GET_MAX. The
-   probed values are calculated in dB. 
+   probed values are calculated in dB.
 */
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h> 
+#include <string.h>
 
 #include <inttypes.h>
 #include <math.h>
@@ -59,16 +59,16 @@ typedef struct af_volume_s
 // Initialization and runtime control
 static int control(struct af_instance_s* af, int cmd, void* arg)
 {
-  af_volume_t* s   = (af_volume_t*)af->setup; 
+  af_volume_t* s   = (af_volume_t*)af->setup;
 
   switch(cmd){
   case AF_CONTROL_REINIT:
     // Sanity check
     if(!arg) return AF_ERROR;
-    
+
     af->data->rate   = ((af_data_t*)arg)->rate;
     af->data->nch    = ((af_data_t*)arg)->nch;
-    
+
     if(s->fast && (((af_data_t*)arg)->format != (AF_FORMAT_FLOAT_NE))){
       af->data->format = AF_FORMAT_S16_NE;
       af->data->bps    = 2;
@@ -91,22 +91,22 @@ static int control(struct af_instance_s*
     for(i=0;i<AF_NCH;i++) vol[i]=v;
     return control(af,AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET, vol);
   }
-  case AF_CONTROL_POST_CREATE:	
-    s->fast = ((((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) == 
+  case AF_CONTROL_POST_CREATE:
+    s->fast = ((((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) ==
       AF_INIT_FLOAT) ? 0 : 1;
     return AF_OK;
   case AF_CONTROL_VOLUME_ON_OFF | AF_CONTROL_SET:
     memcpy(s->enable,(int*)arg,AF_NCH*sizeof(int));
-    return AF_OK; 
+    return AF_OK;
   case AF_CONTROL_VOLUME_ON_OFF | AF_CONTROL_GET:
     memcpy((int*)arg,s->enable,AF_NCH*sizeof(int));
-    return AF_OK; 
+    return AF_OK;
   case AF_CONTROL_VOLUME_SOFTCLIP | AF_CONTROL_SET:
     s->soft = *(int*)arg;
-    return AF_OK; 
+    return AF_OK;
   case AF_CONTROL_VOLUME_SOFTCLIP | AF_CONTROL_GET:
     *(int*)arg = s->soft;
-    return AF_OK; 
+    return AF_OK;
   case AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_SET:
     return af_from_dB(AF_NCH,(float*)arg,s->level,20.0,-200.0,60.0);
   case AF_CONTROL_VOLUME_LEVEL | AF_CONTROL_GET:
@@ -130,7 +130,7 @@ static int control(struct af_instance_s*
   return AF_UNKNOWN;
 }
 
-// Deallocate memory 
+// Deallocate memory
 static void uninit(struct af_instance_s* af)
 {
   if(af->data)
@@ -145,7 +145,7 @@ static af_data_t* play(struct af_instanc
   af_data_t*    c   = data;			// Current working data
   af_volume_t*  s   = (af_volume_t*)af->setup; 	// Setup for this instance
   int           ch  = 0;			// Channel counter
-  register int	nch = c->nch;			// Number of channels	
+  register int	nch = c->nch;			// Number of channels
   register int  i   = 0;
 
   // Basic operation volume control only (used on slow machines)
@@ -154,7 +154,7 @@ static af_data_t* play(struct af_instanc
     int         len = c->len/2;			// Number of samples
     for(ch = 0; ch < nch ; ch++){
       if(s->enable[ch]){
-	register int vol = (int)(255.0 * s->level[ch]); 
+	register int vol = (int)(255.0 * s->level[ch]);
 	for(i=ch;i<len;i+=nch){
 	  register int x = (a[i] * vol) >> 8;
 	  a[i]=clamp(x,SHRT_MIN,SHRT_MAX);
@@ -163,7 +163,7 @@ static af_data_t* play(struct af_instanc
     }
   }
   // Machine is fast and data is floating point
-  else if(af->data->format == (AF_FORMAT_FLOAT_NE)){ 
+  else if(af->data->format == (AF_FORMAT_FLOAT_NE)){
     float*   	a   	= (float*)c->audio;	// Audio data
     int       	len 	= c->len/4;		// Number of samples
     for(ch = 0; ch < nch ; ch++){
@@ -172,7 +172,7 @@ static af_data_t* play(struct af_instanc
 	float	t   = 1.0 - s->time;
 	for(i=ch;i<len;i+=nch){
 	  register float x 	= a[i];
-	  register float pow 	= x*x;	
+	  register float pow 	= x*x;
 	  // Check maximum power value
 	  if(pow > s->max[ch])
 	    s->max[ch] = pow;

Modified: trunk/libaf/control.h
==============================================================================
--- trunk/libaf/control.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/control.h	Wed May 13 04:58:57 2009	(r29305)
@@ -22,12 +22,12 @@
 #include <sys/types.h>
 
 /*********************************************
-// Control info struct. 
+// Control info struct.
 //
 // This struct is the argument in a info call to a filter.
 */
 
-// Argument types 
+// Argument types
 #define AF_CONTROL_TYPE_BOOL	(0x0<<0)
 #define AF_CONTROL_TYPE_CHAR	(0x1<<0)
 #define AF_CONTROL_TYPE_INT	(0x2<<0)
@@ -52,9 +52,9 @@ typedef struct af_control_info_s{
   int	 def;	// Control enumrification
   char*	 name; 	// Name of argument
   char*	 info;	// Description of what it does
-  int 	 flags;	// Flags as defined above	
-  float	 max;	// Max and min value 
-  float	 min;	// (only aplicable on float and int) 
+  int 	 flags;	// Flags as defined above
+  float	 max;	// Max and min value
+  float	 min;	// (only aplicable on float and int)
   int	 xdim;	// 1st dimension
   int	 ydim;	// 2nd dimension (=0 for everything except matrix)
   size_t sz;	// Size of argument in bytes
@@ -73,10 +73,10 @@ typedef struct af_control_ext_s{
 }af_control_ext_t;
 
 /*********************************************
-// Control parameters 
+// Control parameters
 */
 
-/* The control system is divided into 3 levels 
+/* The control system is divided into 3 levels
    mandatory calls 	 - all filters must answer to all of these
    optional calls  	 - are optional
    filter specific calls - applies only to some filters
@@ -115,12 +115,12 @@ typedef struct af_control_ext_s{
 // FILTER SPECIFIC CALLS
 
 // Basic operations: These can be ored with any of the below calls
-// Set argument 
+// Set argument
 #define AF_CONTROL_SET			0x00000000
 // Get argument
 #define AF_CONTROL_GET			0x00000001
 // Get info about the control, i.e fill in everything except argument
-#define AF_CONTROL_INFO			0x00000002  
+#define AF_CONTROL_INFO			0x00000002
 
 // Resample
 
@@ -153,8 +153,8 @@ typedef struct af_control_ext_s{
 
 // Set make af_channels into a router
 #define AF_CONTROL_CHANNELS_ROUTER	0x00000A00 | AF_CONTROL_FILTER_SPECIFIC
-	
-// Volume 
+
+// Volume
 
 // Turn volume control on and off, arg is int*
 #define AF_CONTROL_VOLUME_ON_OFF	0x00000B00 | AF_CONTROL_FILTER_SPECIFIC
@@ -165,10 +165,10 @@ typedef struct af_control_ext_s{
 // Set volume level, arg is a float* with the volume for all the channels
 #define AF_CONTROL_VOLUME_LEVEL		0x00000D00 | AF_CONTROL_FILTER_SPECIFIC
 
-// Probed power level for all channels, arg is a float* 
+// Probed power level for all channels, arg is a float*
 #define AF_CONTROL_VOLUME_PROBE		0x00000E00 | AF_CONTROL_FILTER_SPECIFIC
 
-// Maximum probed power level for all channels, arg is a float* 
+// Maximum probed power level for all channels, arg is a float*
 #define AF_CONTROL_VOLUME_PROBE_MAX	0x00000F00 | AF_CONTROL_FILTER_SPECIFIC
 
 // Compressor/expander
@@ -193,13 +193,13 @@ typedef struct af_control_ext_s{
 // Turn noise gate on an off
 #define AF_CONTROL_GATE_ON_OFF	 	0x00001500 | AF_CONTROL_FILTER_SPECIFIC
 
-// Noise gate threshold [dB] 
+// Noise gate threshold [dB]
 #define AF_CONTROL_GATE_THRESH	 	0x00001600 | AF_CONTROL_FILTER_SPECIFIC
 
 // Noise gate attack time [ms]
 #define AF_CONTROL_GATE_ATTACK	 	0x00001700 | AF_CONTROL_FILTER_SPECIFIC
 
-// Noise gate release time [ms] 
+// Noise gate release time [ms]
 #define AF_CONTROL_GATE_RELEASE 	0x00001800 | AF_CONTROL_FILTER_SPECIFIC
 
 // Noise gate release range level [dB]
@@ -207,16 +207,16 @@ typedef struct af_control_ext_s{
 
 // Pan
 
-// Pan levels, arg is a control_ext with a float* 
+// Pan levels, arg is a control_ext with a float*
 #define AF_CONTROL_PAN_LEVEL	 	0x00001A00 | AF_CONTROL_FILTER_SPECIFIC
 
 // Number of outputs from pan, arg is int*
 #define AF_CONTROL_PAN_NOUT	 	0x00001B00 | AF_CONTROL_FILTER_SPECIFIC
- 
+
 // Balance, arg is float*; range -1 (left) to 1 (right), 0 center
 #define AF_CONTROL_PAN_BALANCE	 	0x00002500 | AF_CONTROL_FILTER_SPECIFIC
 
-// Set equalizer gain, arg is a control_ext with a float* 
+// Set equalizer gain, arg is a control_ext with a float*
 #define AF_CONTROL_EQUALIZER_GAIN 	0x00001C00 | AF_CONTROL_FILTER_SPECIFIC
 
 

Modified: trunk/libaf/equalizer.h
==============================================================================
--- trunk/libaf/equalizer.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/equalizer.h	Wed May 13 04:58:57 2009	(r29305)
@@ -26,8 +26,8 @@
 
 typedef struct equalizer_s
 {
-  float gain;   	// Gain in dB  -15 - 15 
-  int	channel; 	// Channel number 0 - 5 
+  float gain;   	// Gain in dB  -15 - 15
+  int	channel; 	// Channel number 0 - 5
   int 	band;		// Frequency band 0 - 9
 }equalizer_t;
 

Modified: trunk/libaf/filter.c
==============================================================================
--- trunk/libaf/filter.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/filter.c	Wed May 13 04:58:57 2009	(r29305)
@@ -32,13 +32,13 @@
 
    n number of filter taps, where mod(n,4)==0
    w filter taps
-   x input signal must be a circular buffer which is indexed backwards 
+   x input signal must be a circular buffer which is indexed backwards
 */
 inline FLOAT_TYPE af_filter_fir(register unsigned int n, const FLOAT_TYPE* w,
                                 const FLOAT_TYPE* x)
 {
   register FLOAT_TYPE y; // Output
-  y = 0.0; 
+  y = 0.0;
   do{
     n--;
     y+=w[n]*x[n];
@@ -52,7 +52,7 @@ inline FLOAT_TYPE af_filter_fir(register
    d  number of filters
    xi current index in xq
    w  filter taps k by n big
-   x  input signal must be a circular buffers which are indexed backwards 
+   x  input signal must be a circular buffers which are indexed backwards
    y  output buffer
    s  output buffer stride
 */
@@ -82,7 +82,7 @@ int af_filter_updatepq(unsigned int n, u
 {
   register FLOAT_TYPE* txq = *xq + xi;
   register int nt = n*2;
-  
+
   while(d-- >0){
     *txq= *(txq+n) = *in;
     txq+=nt;
@@ -99,13 +99,13 @@ int af_filter_updatepq(unsigned int n, u
 
    n     filter length must be odd for HP and BS filters
    w     buffer for the filter taps (must be n long)
-   fc    cutoff frequencies (1 for LP and HP, 2 for BP and BS) 
+   fc    cutoff frequencies (1 for LP and HP, 2 for BP and BS)
          0 < fc < 1 where 1 <=> Fs/2
    flags window and filter type as defined in filter.h
-         variables are ored together: i.e. LP|HAMMING will give a 
-	 low pass filter designed using a hamming window  
+         variables are ored together: i.e. LP|HAMMING will give a
+	 low pass filter designed using a hamming window
    opt   beta constant used only when designing using kaiser windows
-   
+
    returns 0 if OK, -1 if fail
 */
 int af_filter_design_fir(unsigned int n, FLOAT_TYPE* w, const FLOAT_TYPE* fc,
@@ -142,10 +142,10 @@ int af_filter_design_fir(unsigned int n,
   case(KAISER):
     af_window_kaiser(n,w,opt); break;
   default:
-    return -1;	
+    return -1;
   }
 
-  if(flags & (LP | HP)){ 
+  if(flags & (LP | HP)){
     fc1=*fc;
     // Cutoff frequency must be < 0.5 where 0.5 <=> Fs/2
     fc1 = ((fc1 <= 1.0) && (fc1 > 0.0)) ? fc1/2 : 0.25;
@@ -154,7 +154,7 @@ int af_filter_design_fir(unsigned int n,
     if(flags & LP){ // Low pass filter
 
       // If the filter length is odd, there is one point which is exactly
-      // in the middle. The value at this point is 2*fCutoff*sin(x)/x, 
+      // in the middle. The value at this point is 2*fCutoff*sin(x)/x,
       // where x is zero. To make sure nothing strange happens, we set this
       // value separately.
       if (o){
@@ -206,9 +206,9 @@ int af_filter_design_fir(unsigned int n,
 	t2 = sin(k3 * t1)/(M_PI * t1); // Sinc fc2
 	t3 = sin(k1 * t1)/(M_PI * t1); // Sinc fc1
 	g += w[end-i-1] * (t3 + t2);   // Total gain in filter
-	w[end-i-1] = w[n-end+i] = w[end-i-1] * (t2 - t3); 
+	w[end-i-1] = w[n-end+i] = w[end-i-1] * (t2 - t3);
       }
-    }      
+    }
     else{ // Band stop
       if (!o) // Band stop filters must have odd length
 	return -1;
@@ -220,7 +220,7 @@ int af_filter_design_fir(unsigned int n,
 	t1 = (FLOAT_TYPE)(i+1);
 	t2 = sin(k1 * t1)/(M_PI * t1); // Sinc fc1
 	t3 = sin(k3 * t1)/(M_PI * t1); // Sinc fc2
-	w[end-i-1] = w[n-end+i] = w[end-i-1] * (t2 - t3); 
+	w[end-i-1] = w[n-end+i] = w[end-i-1] * (t2 - t3);
 	g += 2*w[end-i-1]; // Total gain in filter
       }
     }
@@ -228,9 +228,9 @@ int af_filter_design_fir(unsigned int n,
 
   // Normalize gain
   g=1/g;
-  for (i=0; i<n; i++) 
+  for (i=0; i<n; i++)
     w[i] *= g;
-  
+
   return 0;
 }
 
@@ -239,7 +239,7 @@ int af_filter_design_fir(unsigned int n,
    n     length of prototype filter
    k     number of polyphase components
    w     prototype filter taps
-   pw    Parallel FIR filter 
+   pw    Parallel FIR filter
    g     Filter gain
    flags FWD forward indexing
          REW reverse indexing
@@ -254,7 +254,7 @@ int af_filter_design_pfir(unsigned int n
   int i;     	// Counters
   int j;
   FLOAT_TYPE t;	// g * w[i]
-  
+
   // Sanity check
   if(l<1 || k<1 || !w || !pw)
     return -1;
@@ -287,7 +287,7 @@ int af_filter_design_pfir(unsigned int n
 
 /* Pre-warp the coefficients of a numerator or denominator.
    Note that a0 is assumed to be 1, so there is no wrapping
-   of it.  
+   of it.
 */
 static void af_filter_prewarp(FLOAT_TYPE* a, FLOAT_TYPE fc, FLOAT_TYPE fs)
 {
@@ -299,7 +299,7 @@ static void af_filter_prewarp(FLOAT_TYPE
 
 /* Transform the numerator and denominator coefficients of s-domain
    biquad section into corresponding z-domain coefficients.
-   
+
    The transfer function for z-domain is:
 
           1 + alpha1 * z^(-1) + alpha2 * z^(-2)
@@ -310,7 +310,7 @@ static void af_filter_prewarp(FLOAT_TYPE
    order:
    beta1, beta2    (denominator)
    alpha1, alpha2  (numerator)
-   
+
    Arguments:
    a       - s-domain numerator coefficients
    b       - s-domain denominator coefficients
@@ -318,10 +318,10 @@ static void af_filter_prewarp(FLOAT_TYPE
              biquad section in such a way, as to make it the
              coefficient by which to multiply the overall filter gain
              in order to achieve a desired overall filter gain,
-             specified in initial value of k.  
+             specified in initial value of k.
    fs 	   - sampling rate (Hz)
    coef    - array of z-domain coefficients to be filled in.
- 
+
    Return: On return, set coef z-domain coefficients and k to the gain
    required to maintain overall gain = 1.0;
 */
@@ -352,26 +352,26 @@ static void af_filter_bilinear(const FLO
 /* IIR filter design using bilinear transform and prewarp. Transforms
    2nd order s domain analog filter into a digital IIR biquad link. To
    create a filter fill in a, b, Q and fs and make space for coef and k.
-   
 
-   Example Butterworth design: 
+
+   Example Butterworth design:
 
    Below are Butterworth polynomials, arranged as a series of 2nd
    order sections:
 
    Note: n is filter order.
-   
+
    n  Polynomials
    -------------------------------------------------------------------
    2  s^2 + 1.4142s + 1
    4  (s^2 + 0.765367s + 1) * (s^2 + 1.847759s + 1)
    6  (s^2 + 0.5176387s + 1) * (s^2 + 1.414214 + 1) * (s^2 + 1.931852s + 1)
-   
+
    For n=4 we have following equation for the filter transfer function:
                        1                              1
    T(s) = --------------------------- * ----------------------------
           s^2 + (1/Q) * 0.765367s + 1   s^2 + (1/Q) * 1.847759s + 1
-   
+
    The filter consists of two 2nd order sections since highest s power
    is 2.  Now we can take the coefficients, or the numbers by which s
    is multiplied and plug them into a standard formula to be used by
@@ -414,7 +414,7 @@ static void af_filter_bilinear(const FLO
              biquad section in such a way, as to make it the
              coefficient by which to multiply the overall filter gain
              in order to achieve a desired overall filter gain,
-             specified in initial value of k.  
+             specified in initial value of k.
    fs 	   - sampling rate (Hz)
    coef    - array of z-domain coefficients to be filled in.
 
@@ -432,7 +432,7 @@ int af_filter_szxform(const FLOAT_TYPE* 
   FLOAT_TYPE at[3];
   FLOAT_TYPE bt[3];
 
-  if(!a || !b || !k || !coef || (Q>1000.0 || Q< 1.0)) 
+  if(!a || !b || !k || !coef || (Q>1000.0 || Q< 1.0))
     return -1;
 
   memcpy(at,a,3*sizeof(FLOAT_TYPE));

Modified: trunk/libaf/filter.h
==============================================================================
--- trunk/libaf/filter.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/filter.h	Wed May 13 04:58:57 2009	(r29305)
@@ -26,7 +26,7 @@
 #define MPLAYER_FILTER_H
 
 
-// Design and implementation of different types of digital filters 
+// Design and implementation of different types of digital filters
 
 
 // Flags used for filter design
@@ -79,7 +79,7 @@ int af_filter_szxform(const FLOAT_TYPE* 
 /* Add new data to circular queue designed to be used with a FIR
    filter. xq is the circular queue, in pointing at the new sample, xi
    current index for xq and n the length of the filter. xq must be n*2
-   long. 
+   long.
 */
 #define af_filter_updateq(n,xi,xq,in)\
   xq[xi]=(xq)[(xi)+(n)]=*(in);\

Modified: trunk/libaf/format.c
==============================================================================
--- trunk/libaf/format.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/format.c	Wed May 13 04:58:57 2009	(r29305)
@@ -37,7 +37,7 @@ int af_str2fmt(const char* str)
   else if(strstr(str,"le") || strstr(str,"LE"))
     format |= AF_FORMAT_LE;
   else
-    format |= AF_FORMAT_NE;    
+    format |= AF_FORMAT_NE;
 
   // Scan for special formats
   if(strstr(str,"mulaw") || strstr(str,"MULAW")){
@@ -55,7 +55,7 @@ int af_str2fmt(const char* str)
   if(strstr(str,"imaadpcm") || strstr(str,"IMAADPCM")){
     format |= AF_FORMAT_IMA_ADPCM; return format;
   }
-  
+
   // Scan for int/float
   if(strstr(str,"float") || strstr(str,"FLOAT")){
     format |= AF_FORMAT_F; return format;
@@ -65,10 +65,10 @@ int af_str2fmt(const char* str)
 
   // Scan for signed/unsigned
   if(strstr(str,"unsigned") || strstr(str,"UNSIGNED"))
-    format |= AF_FORMAT_US; 
+    format |= AF_FORMAT_US;
   else
     format |= AF_FORMAT_SI;
-  
+
   return format;
 }
 
@@ -94,7 +94,7 @@ int af_bits2fmt(int bits)
     return (bits/8 - 1) << 3;
 }
 
-/* Convert format to str input str is a buffer for the 
+/* Convert format to str input str is a buffer for the
    converted string, size is the size of the buffer */
 char* af_fmt2str(int format, char* str, int size)
 {
@@ -109,21 +109,21 @@ char* af_fmt2str(int format, char* str, 
     i+=snprintf(str,size-i,"little-endian ");
   else
     i+=snprintf(str,size-i,"big-endian ");
-  
+
   if(format & AF_FORMAT_SPECIAL_MASK){
     switch(format & AF_FORMAT_SPECIAL_MASK){
-    case(AF_FORMAT_MU_LAW): 
+    case(AF_FORMAT_MU_LAW):
       i+=snprintf(&str[i],size-i,"mu-law "); break;
-    case(AF_FORMAT_A_LAW): 
+    case(AF_FORMAT_A_LAW):
       i+=snprintf(&str[i],size-i,"A-law "); break;
-    case(AF_FORMAT_MPEG2): 
+    case(AF_FORMAT_MPEG2):
       i+=snprintf(&str[i],size-i,"MPEG-2 "); break;
-    case(AF_FORMAT_AC3): 
+    case(AF_FORMAT_AC3):
       i+=snprintf(&str[i],size-i,"AC3 "); break;
-    case(AF_FORMAT_IMA_ADPCM): 
+    case(AF_FORMAT_IMA_ADPCM):
       i+=snprintf(&str[i],size-i,"IMA-ADPCM "); break;
     default:
-      i+=snprintf(&str[i],size-i,MSGTR_AF_FORMAT_UnknownFormat); 
+      i+=snprintf(&str[i],size-i,MSGTR_AF_FORMAT_UnknownFormat);
     }
   }
   else{
@@ -183,7 +183,7 @@ static struct {
     { "floatle", AF_FORMAT_FLOAT_LE },
     { "floatbe", AF_FORMAT_FLOAT_BE },
     { "floatne", AF_FORMAT_FLOAT_NE },
-	
+
     { NULL, 0 }
 };
 

Modified: trunk/libaf/window.c
==============================================================================
--- trunk/libaf/window.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libaf/window.c	Wed May 13 04:58:57 2009	(r29305)
@@ -46,7 +46,7 @@ void af_window_boxcar(int n, FLOAT_TYPE*
 /*
 // Triang a.k.a Bartlett
 //
-//               |    (N-1)| 
+//               |    (N-1)|
 //           2 * |k - -----|
 //               |      2  |
 // w = 1.0 - ---------------
@@ -60,7 +60,7 @@ void af_window_triang(int n, FLOAT_TYPE*
   FLOAT_TYPE k2  = 1/((FLOAT_TYPE)n + k1);
   int      end = (n + 1) >> 1;
   int	   i;
-  
+
   // Calculate window coefficients
   for (i=0 ; i<end ; i++)
     w[i] = w[n-i-1] = (2.0*((FLOAT_TYPE)(i+1))-(1.0-k1))*k2;
@@ -79,7 +79,7 @@ void af_window_hanning(int n, FLOAT_TYPE
 {
   int	   i;
   FLOAT_TYPE k = 2*M_PI/((FLOAT_TYPE)(n+1)); // 2*pi/(N+1)
-  
+
   // Calculate window coefficients
   for (i=0; i<n; i++)
     *w++ = 0.5*(1.0 - cos(k*(FLOAT_TYPE)(i+1)));
@@ -138,23 +138,23 @@ void af_window_flattop(int n,FLOAT_TYPE*
   int      i;
   FLOAT_TYPE k1 = 2*M_PI/((FLOAT_TYPE)(n-1)); // 2*pi/(N-1)
   FLOAT_TYPE k2 = 2*k1;                   // 4*pi/(N-1)
-  
+
   // Calculate window coefficients
   for (i=0; i<n; i++)
     *w++ = 0.2810638602 - 0.5208971735*cos(k1*(FLOAT_TYPE)i)
                         + 0.1980389663*cos(k2*(FLOAT_TYPE)i);
 }
 
-/* Computes the 0th order modified Bessel function of the first kind.  
-// (Needed to compute Kaiser window) 
-//   
+/* Computes the 0th order modified Bessel function of the first kind.
+// (Needed to compute Kaiser window)
+//
 // y = sum( (x/(2*n))^2 )
 //      n
 */
-#define BIZ_EPSILON 1E-21 // Max error acceptable 
+#define BIZ_EPSILON 1E-21 // Max error acceptable
 
 static FLOAT_TYPE besselizero(FLOAT_TYPE x)
-{ 
+{
   FLOAT_TYPE temp;
   FLOAT_TYPE sum   = 1.0;
   FLOAT_TYPE u     = 1.0;
@@ -183,10 +183,10 @@ static FLOAT_TYPE besselizero(FLOAT_TYPE
 // Gold (Theory and Application of DSP) under Kaiser windows for more
 // about Beta.  The following table from Rabiner and Gold gives some
 // feel for the effect of Beta:
-// 
+//
 // All ripples in dB, width of transition band = D*N where N = window
 // length
-// 
+//
 // BETA    D       PB RIP   SB RIP
 // 2.120   1.50  +-0.27      -30
 // 3.384   2.23    0.0864    -40
@@ -203,8 +203,8 @@ void af_window_kaiser(int n, FLOAT_TYPE*
   FLOAT_TYPE k1  = 1.0/besselizero(b);
   int	   k2  = 1 - (n & 1);
   int      end = (n + 1) >> 1;
-  int      i; 
-  
+  int      i;
+
   // Calculate window coefficients
   for (i=0 ; i<end ; i++){
     tmp = (FLOAT_TYPE)(2*i + k2) / ((FLOAT_TYPE)n - 1.0);

Modified: trunk/libao2/ao_alsa.c
==============================================================================
--- trunk/libao2/ao_alsa.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_alsa.c	Wed May 13 04:58:57 2009	(r29305)
@@ -57,7 +57,7 @@
 #include "audio_out_internal.h"
 #include "libaf/af_format.h"
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
     "ALSA-0.9.x-1.x audio output",
     "alsa",
@@ -73,7 +73,7 @@ static snd_pcm_hw_params_t *alsa_hwparam
 static snd_pcm_sw_params_t *alsa_swparams;
 
 /* 16 sets buffersize to 16 * chunksize is as default 1024
- * which seems to be good avarge for most situations 
+ * which seems to be good avarge for most situations
  * so buffersize is 16384 frames by default */
 static int alsa_fragcount = 16;
 static snd_pcm_uframes_t chunk_size = 1024;
@@ -156,7 +156,7 @@ static int control(int cmd, void *arg)
 
       //allocate simple id
       snd_mixer_selem_id_alloca(&sid);
-	
+
       //sets simple-mixer index and name
       snd_mixer_selem_id_set_index(sid, mix_index);
       snd_mixer_selem_id_set_name(sid, mix_name);
@@ -172,7 +172,7 @@ static int control(int cmd, void *arg)
       }
 
       if ((err = snd_mixer_attach(handle, card)) < 0) {
-	mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_MixerAttachError, 
+	mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_MixerAttachError,
 	       card, snd_strerror(err));
 	snd_mixer_close(handle);
 	return CONTROL_ERROR;
@@ -207,7 +207,7 @@ static int control(int cmd, void *arg)
 
 	//setting channels
 	if ((err = snd_mixer_selem_set_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, set_vol)) < 0) {
-	  mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_ErrorSettingLeftChannel, 
+	  mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_ErrorSettingLeftChannel,
 		 snd_strerror(err));
 	  return CONTROL_ERROR;
 	}
@@ -216,11 +216,11 @@ static int control(int cmd, void *arg)
 	set_vol = vol->right / f_multi + pmin + 0.5;
 
 	if ((err = snd_mixer_selem_set_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, set_vol)) < 0) {
-	  mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_ErrorSettingRightChannel, 
+	  mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_ErrorSettingRightChannel,
 		 snd_strerror(err));
 	  return CONTROL_ERROR;
 	}
-	mp_msg(MSGT_AO,MSGL_DBG2,"right=%li, pmin=%li, pmax=%li, mult=%f\n", 
+	mp_msg(MSGT_AO,MSGL_DBG2,"right=%li, pmin=%li, pmax=%li, mult=%f\n",
 	       set_vol, pmin, pmax, f_multi);
 
 	if (snd_mixer_selem_has_playback_switch(elem)) {
@@ -245,7 +245,7 @@ static int control(int cmd, void *arg)
       snd_mixer_close(handle);
       return CONTROL_OK;
     }
-    
+
   } //end switch
   return CONTROL_UNKNOWN;
 }
@@ -349,7 +349,7 @@ static int init(int rate_hz, int channel
 #endif
 
     snd_lib_error_set_handler(alsa_error_handler);
-    
+
     ao_data.samplerate = rate_hz;
     ao_data.format = format;
     ao_data.channels = channels;
@@ -409,7 +409,7 @@ static int init(int rate_hz, int channel
 	alsa_format = SND_PCM_FORMAT_MPEG; //? default should be -1
 	break;
       }
-    
+
     //subdevice parsing
     // set defaults
     block = 1;
@@ -537,11 +537,11 @@ static int init(int rate_hz, int channel
 		 snd_strerror(err));
 	  return 0;
 	}
-    
+
       err = snd_pcm_hw_params_set_access(alsa_handler, alsa_hwparams,
 					 SND_PCM_ACCESS_RW_INTERLEAVED);
       if (err < 0) {
-	mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetAccessType, 
+	mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetAccessType,
 	       snd_strerror(err));
 	return 0;
       }
@@ -585,8 +585,8 @@ static int init(int rate_hz, int channel
 	}
 #endif
 
-      if ((err = snd_pcm_hw_params_set_rate_near(alsa_handler, alsa_hwparams, 
-						 &ao_data.samplerate, NULL)) < 0) 
+      if ((err = snd_pcm_hw_params_set_rate_near(alsa_handler, alsa_hwparams,
+						 &ao_data.samplerate, NULL)) < 0)
         {
 	  mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetSamplerate2,
 		 snd_strerror(err));
@@ -602,7 +602,7 @@ static int init(int rate_hz, int channel
 	int alsa_buffer_time = 500000; /* original 60 */
 	int alsa_period_time;
 	alsa_period_time = alsa_buffer_time/4;
-	if ((err = snd_pcm_hw_params_set_buffer_time_near(alsa_handler, alsa_hwparams, 
+	if ((err = snd_pcm_hw_params_set_buffer_time_near(alsa_handler, alsa_hwparams,
 							  &alsa_buffer_time, NULL)) < 0)
 	  {
 	    mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetBufferTimeNear,
@@ -611,7 +611,7 @@ static int init(int rate_hz, int channel
 	  } else
 	    alsa_buffer_time = err;
 
-	if ((err = snd_pcm_hw_params_set_period_time_near(alsa_handler, alsa_hwparams, 
+	if ((err = snd_pcm_hw_params_set_period_time_near(alsa_handler, alsa_hwparams,
 							  &alsa_period_time, NULL)) < 0)
 	  /* original: alsa_buffer_time/ao_data.bps */
 	  {
@@ -621,13 +621,13 @@ static int init(int rate_hz, int channel
 	  }
 	mp_msg(MSGT_AO,MSGL_INFO,MSGTR_AO_ALSA_BufferTimePeriodTime,
 	       alsa_buffer_time, err);
-      } 
+      }
 #endif//end SET_BUFFERTIME
 
 #ifdef SET_CHUNKSIZE
       {
 	//set chunksize
-	if ((err = snd_pcm_hw_params_set_period_size_near(alsa_handler, alsa_hwparams, 
+	if ((err = snd_pcm_hw_params_set_period_size_near(alsa_handler, alsa_hwparams,
 							  &chunk_size, NULL)) < 0)
 	  {
 	    mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetPeriodSize,
@@ -639,7 +639,7 @@ static int init(int rate_hz, int channel
 	}
 	if ((err = snd_pcm_hw_params_set_periods_near(alsa_handler, alsa_hwparams,
 						      &alsa_fragcount, NULL)) < 0) {
-	  mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetPeriods, 
+	  mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_UnableToSetPeriods,
 		 snd_strerror(err));
 	  return 0;
 	}
@@ -870,15 +870,15 @@ static int get_space(void)
 {
     snd_pcm_status_t *status;
     int ret;
-    
+
     snd_pcm_status_alloca(&status);
-    
+
     if ((ret = snd_pcm_status(alsa_handler, status)) < 0)
     {
 	mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_ALSA_CannotGetPcmStatus, snd_strerror(ret));
 	return 0;
     }
-    
+
     ret = snd_pcm_status_get_avail(status) * bytes_per_sample;
     if (ret > ao_data.buffersize)  // Buffer underrun?
 	ret = ao_data.buffersize;
@@ -890,10 +890,10 @@ static float get_delay(void)
 {
   if (alsa_handler) {
     snd_pcm_sframes_t delay;
-    
+
     if (snd_pcm_delay(alsa_handler, &delay) < 0)
       return 0;
-    
+
     if (delay < 0) {
       /* underrun - move the application pointer forward to catch up */
 #if SND_LIB_VERSION >= 0x000901 /* snd_pcm_forward() exists since 0.9.0rc8 */

Modified: trunk/libao2/ao_alsa5.c
==============================================================================
--- trunk/libao2/ao_alsa5.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_alsa5.c	Wed May 13 04:58:57 2009	(r29305)
@@ -32,7 +32,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
     "ALSA-0.5.x audio output",
     "alsa5",
@@ -117,7 +117,7 @@ static int init(int rate_hz, int channel
 	    alsa_format.format = SND_PCM_SFMT_MPEG;
 	    break;
     }
-    
+
     switch(alsa_format.format)
     {
 	case SND_PCM_SFMT_S16_LE:
@@ -230,7 +230,7 @@ static int init(int rate_hz, int channel
     setup.format = alsa_format;
     setup.buf.stream.queue_size = ao_data.buffersize;
     setup.msbits_per_sample = ao_data.bps;
-    
+
     if ((err = snd_pcm_channel_setup(alsa_handler, &setup)) < 0)
     {
 	mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_ALSA5_CantSetChan, snd_strerror(err));
@@ -333,10 +333,10 @@ static void audio_resume(void)
 static int play(void* data, int len, int flags)
 {
     int got_len;
-    
+
     if (!len)
 	return 0;
-    
+
     if ((got_len = snd_pcm_write(alsa_handler, data, len)) < 0)
     {
 	if (got_len == -EPIPE) /* underrun? */
@@ -365,7 +365,7 @@ static int play(void* data, int len, int
 static int get_space(void)
 {
     snd_pcm_channel_status_t ch_stat;
-    
+
     ch_stat.channel = SND_PCM_CHANNEL_PLAYBACK;
 
     if (snd_pcm_channel_status(alsa_handler, &ch_stat) < 0)
@@ -378,9 +378,9 @@ static int get_space(void)
 static float get_delay(void)
 {
     snd_pcm_channel_status_t ch_stat;
-    
+
     ch_stat.channel = SND_PCM_CHANNEL_PLAYBACK;
-    
+
     if (snd_pcm_channel_status(alsa_handler, &ch_stat) < 0)
 	return (float)ao_data.buffersize/(float)ao_data.bps; /* error occurred */
     else

Modified: trunk/libao2/ao_coreaudio.c
==============================================================================
--- trunk/libao2/ao_coreaudio.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_coreaudio.c	Wed May 13 04:58:57 2009	(r29305)
@@ -174,7 +174,7 @@ Float32 vol;
 				ao->b_muted = 0;
 			return CONTROL_TRUE;
 		}
-		
+
 		vol=(control_vol->left+control_vol->right)*4.0/200.0;
 		err = AudioUnitSetParameter(ao->theOutputUnit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, vol, 0);
 		if(err==0) {
@@ -189,7 +189,7 @@ Float32 vol;
 	default:
 	  return CONTROL_FALSE;
 	}
-	
+
 }
 
 
@@ -237,8 +237,8 @@ static OSStatus DeviceListener( AudioDev
 static int init(int rate,int channels,int format,int flags)
 {
 AudioStreamBasicDescription inDesc;
-ComponentDescription desc; 
-Component comp; 
+ComponentDescription desc;
+Component comp;
 AURenderCallbackStruct renderCallback;
 OSStatus err;
 UInt32 size, maxFrames, i_param_size;
@@ -396,20 +396,20 @@ int b_alive;
 	desc.componentManufacturer = kAudioUnitManufacturer_Apple;
 	desc.componentFlags = 0;
 	desc.componentFlagsMask = 0;
-				
+
 	comp = FindNextComponent(NULL, &desc);  //Finds an component that meets the desc spec's
 	if (comp == NULL) {
 		ao_msg(MSGT_AO, MSGL_WARN, "Unable to find Output Unit component\n");
 		goto err_out;
 	}
-		
+
 	err = OpenAComponent(comp, &(ao->theOutputUnit));  //gains access to the services provided by the component
 	if (err) {
 		ao_msg(MSGT_AO, MSGL_WARN, "Unable to open Output Unit component: [%4.4s]\n", (char *)&err);
 		goto err_out;
 	}
 
-	// Initialize AudioUnit 
+	// Initialize AudioUnit
 	err = AudioUnitInitialize(ao->theOutputUnit);
 	if (err) {
 		ao_msg(MSGT_AO, MSGL_WARN, "Unable to initialize Output Unit component: [%4.4s]\n", (char *)&err);
@@ -426,7 +426,7 @@ int b_alive;
 
 	size = sizeof(UInt32);
 	err = AudioUnitGetProperty(ao->theOutputUnit, kAudioDevicePropertyBufferSize, kAudioUnitScope_Input, 0, &maxFrames, &size);
-	
+
 	if (err)
 	{
 		ao_msg(MSGT_AO,MSGL_WARN, "AudioUnitGetProperty returned [%4.4s] when getting kAudioDevicePropertyBufferSize\n", (char *)&err);
@@ -434,7 +434,7 @@ int b_alive;
 	}
 
 	ao->chunk_size = maxFrames;//*inDesc.mBytesPerFrame;
-    
+
 	ao_data.samplerate = inDesc.mSampleRate;
 	ao_data.channels = inDesc.mChannelsPerFrame;
     ao_data.bps = ao_data.samplerate * inDesc.mBytesPerFrame;
@@ -444,7 +444,7 @@ int b_alive;
 	ao->num_chunks = (ao_data.bps+ao->chunk_size-1)/ao->chunk_size;
     ao->buffer_len = ao->num_chunks * ao->chunk_size;
     ao->buffer = av_fifo_alloc(ao->buffer_len);
-	
+
 	ao_msg(MSGT_AO,MSGL_V, "using %5d chunks of %d bytes (buffer len %d bytes)\n", (int)ao->num_chunks, (int)ao->chunk_size, (int)ao->buffer_len);
 
     renderCallback.inputProc = theRenderProc;
@@ -456,7 +456,7 @@ int b_alive;
 	}
 
 	reset();
-    
+
     return CONTROL_OK;
 
 err_out2:
@@ -467,7 +467,7 @@ err_out:
     av_fifo_free(ao->buffer);
     free(ao);
     ao = NULL;
-    return CONTROL_FALSE; 
+    return CONTROL_FALSE;
 }
 
 /*****************************************************************************
@@ -734,7 +734,7 @@ err_out:
     av_fifo_free(ao->buffer);
     free(ao);
     ao = NULL;
-    return CONTROL_FALSE; 
+    return CONTROL_FALSE;
 }
 
 /*****************************************************************************
@@ -943,7 +943,7 @@ static OSStatus RenderCallbackSPDIF( Aud
 
 
 static int play(void* output_samples,int num_bytes,int flags)
-{  
+{
     int wrote, b_digital;
 
     // Check whether we need to reset the digital output stream.

Modified: trunk/libao2/ao_dsound.c
==============================================================================
--- trunk/libao2/ao_dsound.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_dsound.c	Wed May 13 04:58:57 2009	(r29305)
@@ -113,17 +113,17 @@ static const int channel_mask[] = {
 };
 
 static HINSTANCE hdsound_dll = NULL;      ///handle to the dll
-static LPDIRECTSOUND hds = NULL;          ///direct sound object 
+static LPDIRECTSOUND hds = NULL;          ///direct sound object
 static LPDIRECTSOUNDBUFFER hdspribuf = NULL; ///primary direct sound buffer
 static LPDIRECTSOUNDBUFFER hdsbuf = NULL; ///secondary direct sound buffer (stream buffer)
-static int buffer_size = 0;               ///size in bytes of the direct sound buffer   
+static int buffer_size = 0;               ///size in bytes of the direct sound buffer
 static int write_offset = 0;              ///offset of the write cursor in the direct sound buffer
 static int min_free_space = 0;            ///if the free space is below this value get_space() will return 0
                                           ///there will always be at least this amout of free space to prevent
                                           ///get_space() from returning wrong values when buffer is 100% full.
                                           ///will be replaced with nBlockAlign in init()
 static int device_num = 0;                ///wanted device number
-static GUID device;                       ///guid of the device 
+static GUID device;                       ///guid of the device
 
 /***************************************************************************************/
 
@@ -221,17 +221,17 @@ static int InitDirectSound(void)
 
 	// initialize directsound
     HRESULT (WINAPI *OurDirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);
-	HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKA, LPVOID);   
+	HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKA, LPVOID);
 	int device_index=0;
 	opt_t subopts[] = {
 	  {"device", OPT_ARG_INT, &device_num,NULL},
 	  {NULL}
-	}; 
+	};
 	if (subopt_parse(ao_subdevice, subopts) != 0) {
 		print_help();
 		return 0;
 	}
-    
+
 	hdsound_dll = LoadLibrary("DSOUND.DLL");
 	if (hdsound_dll == NULL) {
 		mp_msg(MSGT_AO, MSGL_ERR, "ao_dsound: cannot load DSOUND.DLL\n");
@@ -245,7 +245,7 @@ static int InitDirectSound(void)
 		FreeLibrary(hdsound_dll);
 		return 0;
 	}
-    
+
 	// Enumerate all directsound devices
 	mp_msg(MSGT_AO, MSGL_V,"ao_dsound: Output Devices:\n");
 	OurDirectSoundEnumerate(DirectSoundEnum,&device_index);
@@ -310,22 +310,22 @@ static void DestroyBuffer(void)
 static int write_buffer(unsigned char *data, int len)
 {
   HRESULT res;
-  LPVOID lpvPtr1; 
-  DWORD dwBytes1; 
-  LPVOID lpvPtr2; 
-  DWORD dwBytes2; 
-	
+  LPVOID lpvPtr1;
+  DWORD dwBytes1;
+  LPVOID lpvPtr2;
+  DWORD dwBytes2;
+
   // Lock the buffer
-  res = IDirectSoundBuffer_Lock(hdsbuf,write_offset, len, &lpvPtr1, &dwBytes1, &lpvPtr2, &dwBytes2, 0); 
-  // If the buffer was lost, restore and retry lock. 
-  if (DSERR_BUFFERLOST == res) 
-  { 
+  res = IDirectSoundBuffer_Lock(hdsbuf,write_offset, len, &lpvPtr1, &dwBytes1, &lpvPtr2, &dwBytes2, 0);
+  // If the buffer was lost, restore and retry lock.
+  if (DSERR_BUFFERLOST == res)
+  {
     IDirectSoundBuffer_Restore(hdsbuf);
 	res = IDirectSoundBuffer_Lock(hdsbuf,write_offset, len, &lpvPtr1, &dwBytes1, &lpvPtr2, &dwBytes2, 0);
   }
- 
-  
-  if (SUCCEEDED(res)) 
+
+
+  if (SUCCEEDED(res))
   {
   	if( (ao_data.channels == 6) && (ao_data.format!=AF_FORMAT_AC3) ) {
   	    // reorder channels while writing to pointers.
@@ -354,27 +354,27 @@ static int write_buffer(unsigned char *d
   	    write_offset+=dwBytes1+dwBytes2;
   	    if(write_offset>=buffer_size)write_offset=dwBytes2;
   	} else {
-  	    // Write to pointers without reordering. 
+  	    // Write to pointers without reordering.
 	fast_memcpy(lpvPtr1,data,dwBytes1);
     if (NULL != lpvPtr2 )fast_memcpy(lpvPtr2,data+dwBytes1,dwBytes2);
 	write_offset+=dwBytes1+dwBytes2;
     if(write_offset>=buffer_size)write_offset=dwBytes2;
   	}
-	
-   // Release the data back to DirectSound. 
+
+   // Release the data back to DirectSound.
     res = IDirectSoundBuffer_Unlock(hdsbuf,lpvPtr1,dwBytes1,lpvPtr2,dwBytes2);
-    if (SUCCEEDED(res)) 
-    { 
-	  // Success. 
+    if (SUCCEEDED(res))
+    {
+	  // Success.
 	  DWORD status;
 	  IDirectSoundBuffer_GetStatus(hdsbuf, &status);
       if (!(status & DSBSTATUS_PLAYING)){
 	    res = IDirectSoundBuffer_Play(hdsbuf, 0, 0, DSBPLAY_LOOPING);
 	  }
-	  return dwBytes1+dwBytes2; 
-    } 
-  } 
-  // Lock, Unlock, or Restore failed. 
+	  return dwBytes1+dwBytes2;
+    }
+  }
+  // Lock, Unlock, or Restore failed.
   return 0;
 }
 
@@ -408,7 +408,7 @@ static int control(int cmd, void *arg)
 	return -1;
 }
 
-/** 
+/**
 \brief setup sound device
 \param rate samplerate
 \param channels number of channels
@@ -436,7 +436,7 @@ static int init(int rate, int channels, 
 		default:
 			mp_msg(MSGT_AO, MSGL_V,"ao_dsound: format %s not supported defaulting to Signed 16-bit Little-Endian\n",af_fmt2str_short(format));
 			format=AF_FORMAT_S16_LE;
-	}   	
+	}
 	//fill global ao_data
 	ao_data.channels = channels;
 	ao_data.samplerate = rate;
@@ -493,7 +493,7 @@ static int init(int rate, int channels, 
 	ao_data.outburst = wformat.Format.nBlockAlign * 512;
 
 	// create primary buffer and set its format
-    
+
 	res = IDirectSound_CreateSoundBuffer( hds, &dsbpridesc, &hdspribuf, NULL );
 	if ( res != DS_OK ) {
 		UninitDirectSound();
@@ -553,7 +553,7 @@ static void audio_resume(void)
 	IDirectSoundBuffer_Play(hdsbuf, 0, 0, DSBPLAY_LOOPING);
 }
 
-/** 
+/**
 \brief close audio device
 \param immed stop playback immediately
 */
@@ -579,7 +579,7 @@ static int get_space(void)
 	int space;
 	DWORD play_offset;
 	IDirectSoundBuffer_GetCurrentPosition(hdsbuf,&play_offset,NULL);
-	space=buffer_size-(write_offset-play_offset);                                             
+	space=buffer_size-(write_offset-play_offset);
 	//                |                                                      | <-- const --> |                |                 |
 	//                buffer start                                           play_cursor     write_cursor     write_offset      buffer end
 	// play_cursor is the actual postion of the play cursor
@@ -601,10 +601,10 @@ static int play(void* data, int len, int
 {
 	DWORD play_offset;
 	int space;
-  
+
 	// make sure we have enough space to write data
 	IDirectSoundBuffer_GetCurrentPosition(hdsbuf,&play_offset,NULL);
-	space=buffer_size-(write_offset-play_offset);                                             
+	space=buffer_size-(write_offset-play_offset);
 	if(space > buffer_size)space -= buffer_size; // write_offset < play_offset
 	if(space < len) len = space;
 
@@ -622,7 +622,7 @@ static float get_delay(void)
 	DWORD play_offset;
 	int space;
 	IDirectSoundBuffer_GetCurrentPosition(hdsbuf,&play_offset,NULL);
-	space=play_offset-write_offset;                                             
+	space=play_offset-write_offset;
 	if(space <= 0)space += buffer_size;
 	return (float)(buffer_size - space) / (float)ao_data.bps;
 }

Modified: trunk/libao2/ao_dxr2.c
==============================================================================
--- trunk/libao2/ao_dxr2.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_dxr2.c	Wed May 13 04:58:57 2009	(r29305)
@@ -67,7 +67,7 @@ static int control(int cmd,void *arg){
       ao_control_vol_t* vol = (ao_control_vol_t*)arg;
       // We need this trick because the volume stepping is often too small
       diff = ((vol->left+vol->right) / 2 - (volume*19.0/100.0)) * 19.0 / 100.0;
-      v.arg = volume + (diff > 0 ? ceil(diff) : floor(diff)); 
+      v.arg = volume + (diff > 0 ? ceil(diff) : floor(diff));
       if(v.arg > 19) v.arg = 19;
       if(v.arg < 0) v.arg = 0;
       if(v.arg != volume) {
@@ -95,7 +95,7 @@ static int init(int rate,int channels,in
 	  return 0;
 
         last_freq_id = -1;
-        
+
 	ao_data.outburst=2048;
 	ao_data.samplerate=rate;
 	ao_data.channels=channels;
@@ -178,11 +178,11 @@ static int get_space(void){
 static void dxr2_send_lpcm_packet(unsigned char* data,int len,int id,unsigned int timestamp,int freq_id)
 {
   int write_dxr2(const unsigned char *data, int len);
-  
+
   if(dxr2_fd < 0) {
     mp_msg(MSGT_AO,MSGL_ERR,"DXR2 fd is not valid\n");
     return;
-  }    
+  }
 
   if(last_freq_id != freq_id) {
     ioctl(dxr2_fd, DXR2_IOC_SET_AUDIO_SAMPLE_FREQUENCY, &freq_id);

Modified: trunk/libao2/ao_esd.c
==============================================================================
--- trunk/libao2/ao_esd.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_esd.c	Wed May 13 04:58:57 2009	(r29305)
@@ -122,7 +122,7 @@ static int control(int cmd, void *arg)
 	    vol_cache_time = now;
 	}
 	esd_free_all_info(esd_i);
-	
+
 	return CONTROL_OK;
 
     case AOCONTROL_SET_VOLUME:
@@ -236,19 +236,19 @@ static int init(int rate_hz, int channel
 #ifdef CONFIG_ESD_LATENCY
     esd_latency = esd_get_latency(esd_fd);
 #else
-    esd_latency = ((channels == 1 ? 2 : 1) * ESD_DEFAULT_RATE * 
+    esd_latency = ((channels == 1 ? 2 : 1) * ESD_DEFAULT_RATE *
 		   (ESD_BUF_SIZE + 64 * (4.0f / bytes_per_sample))
-		   ) / rate_hz;  
-    esd_latency += ESD_BUF_SIZE * 2; 
+		   ) / rate_hz;
+    esd_latency += ESD_BUF_SIZE * 2;
 #endif
     if(esd_latency > 0) {
 	lag_serv = (esd_latency * 4.0f) / (bytes_per_sample * rate_hz);
 	lag_seconds = lag_net + lag_serv;
 	audio_delay += lag_seconds;
-	mp_msg(MSGT_AO, MSGL_INFO,MSGTR_AO_ESD_LatencyInfo, 
+	mp_msg(MSGT_AO, MSGL_INFO,MSGTR_AO_ESD_LatencyInfo,
 	       lag_serv, lag_net, lag_seconds);
     }
-    
+
     esd_play_fd = esd_play_stream_fallback(esd_fmt, rate_hz,
 					   server, ESD_CLIENT_NAME);
     if (esd_play_fd < 0) {
@@ -333,7 +333,7 @@ static int play(void* data, int len, int
 	 */
 	n = write(esd_play_fd, (char*)data + offs, ESD_BUF_SIZE);
 	if ( n < 0 ) {
-	    if ( errno != EAGAIN ) 
+	    if ( errno != EAGAIN )
 		dprintf("esd play: write failed: %s\n", strerror(errno));
 	    break;
 	} else if ( n != ESD_BUF_SIZE ) {
@@ -343,13 +343,13 @@ static int play(void* data, int len, int
 	    nwritten += n;
     }
 #endif
-	
+
     if (nwritten > 0) {
 	if (!esd_play_start.tv_sec)
 	    gettimeofday(&esd_play_start, NULL);
 	nsamples = nwritten / esd_bytes_per_sample;
 	esd_samples_written += nsamples;
- 
+
 	dprintf("esd play: %d %lu\n", nsamples, esd_samples_written);
     } else {
 	dprintf("esd play: blocked / %lu\n", esd_samples_written);
@@ -395,7 +395,7 @@ static void reset(void)
 {
 #ifdef	__svr4__
     /* throw away data buffered in the esd connection */
-    if (ioctl(esd_play_fd, I_FLUSH, FLUSHW)) 
+    if (ioctl(esd_play_fd, I_FLUSH, FLUSHW))
 	perror("I_FLUSH");
 #endif
 }
@@ -411,7 +411,7 @@ static int get_space(void)
     float current_delay;
     int space;
 
-    /* 
+    /*
      * Don't buffer too much data in the esd daemon.
      *
      * If we send too much, esd will block in write()s to the sound
@@ -461,7 +461,7 @@ static float get_delay(void)
     gettimeofday(&now, NULL);
     play_time  =  now.tv_sec  - esd_play_start.tv_sec;
     play_time += (now.tv_usec - esd_play_start.tv_usec) / 1000000.;
-    
+
     /* dprintf("esd delay: %f %f\n", play_time, buffered_samples_time); */
 
     if (play_time > buffered_samples_time) {

Modified: trunk/libao2/ao_ivtv.c
==============================================================================
--- trunk/libao2/ao_ivtv.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_ivtv.c	Wed May 13 04:58:57 2009	(r29305)
@@ -41,7 +41,7 @@
 
 static int freq = 0;
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
   "IVTV MPEG Audio Decoder output",
   "ivtv",
@@ -73,7 +73,7 @@ init (int rate, int channels, int format
             "AO: [ivtv] can only handle MPEG audio streams.\n");
     return 0;
   }
-  
+
   ao_data.outburst = 2048;
   ao_data.samplerate = rate;
   ao_data.channels = channels;
@@ -132,11 +132,11 @@ get_space (void)
   x = (float) (vo_pts - ao_data.pts) / 90000.0;
   if (x <= 0)
     return 0;
-  
+
   y  = freq * 4 * x;
   y /= ao_data.outburst;
   y *= ao_data.outburst;
-  
+
   if (y > 32000)
     y = 32000;
 
@@ -148,7 +148,7 @@ static int
 play (void *data, int len, int flags)
 {
   int ivtv_write (unsigned char *data, int len);
-  
+
   if (ao_data.format != AF_FORMAT_MPEG2)
     return 0;
 

Modified: trunk/libao2/ao_jack.c
==============================================================================
--- trunk/libao2/ao_jack.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_jack.c	Wed May 13 04:58:57 2009	(r29305)
@@ -40,7 +40,7 @@
 
 #include <jack/jack.h>
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
   "JACK audio output",
   "jack",

Modified: trunk/libao2/ao_mpegpes.c
==============================================================================
--- trunk/libao2/ao_mpegpes.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_mpegpes.c	Wed May 13 04:58:57 2009	(r29305)
@@ -63,7 +63,7 @@ int vo_mpegpes_fd2 = -1;
 
 #include <errno.h>
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
 #ifdef CONFIG_DVB
 	"DVB audio output",
@@ -194,7 +194,7 @@ static int preinit(const char *arg)
 #ifdef CONFIG_DVB
 	if(!ao_file)
 		return init_device(card);
-#else	
+#else
 	if(!ao_file)
 		return vo_mpegpes_fd;	//video fd
 #endif

Modified: trunk/libao2/ao_nas.c
==============================================================================
--- trunk/libao2/ao_nas.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_nas.c	Wed May 13 04:58:57 2009	(r29305)
@@ -119,7 +119,7 @@ static const char* nas_state(unsigned in
 	return nas_states[state];
 }
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
 	"NAS audio output",
 	"nas",
@@ -201,7 +201,7 @@ static int nas_readBuffer(struct ao_nas_
 	 * Now write the new buffer to the network.
 	 */
 	AuWriteElement(nas_data->aud, nas_data->flow, 0, num, nas_data->server_buffer, AuFalse, &as);
-	if (as != AuSuccess) 
+	if (as != AuSuccess)
 		nas_print_error(nas_data->aud, "nas_readBuffer(): AuWriteElement", as);
 
 	return num;
@@ -229,7 +229,7 @@ static int nas_empty_event_queue(struct 
 {
 	AuEvent ev;
 	int result = 0;
-	
+
 	while (AuScanForTypedEvent(nas_data->aud, AuEventsQueuedAfterFlush,
 				   AuTrue, AuEventTypeElementNotify, &ev)) {
 		AuDispatchEvent(nas_data->aud, &ev);
@@ -462,7 +462,7 @@ static int init(int rate,int channels,in
 	mp_msg(MSGT_AO, MSGL_V, "ao_nas: init(): Using audioserver %s\n", server);
 
 	nas_data->aud = AuOpenServer(server, 0, NULL, 0, NULL, NULL);
-	if (!nas_data->aud) { 
+	if (!nas_data->aud) {
 		mp_msg(MSGT_AO, MSGL_ERR, "ao_nas: init(): Can't open nas audio server -> nosound\n");
 		return 0;
 	}
@@ -571,7 +571,7 @@ static void audio_resume(void)
 static int get_space(void)
 {
 	int result;
-	
+
 	mp_msg(MSGT_AO, MSGL_DBG3, "ao_nas: get_space()\n");
 
 	pthread_mutex_lock(&nas_data->buffer_mutex);
@@ -631,7 +631,7 @@ static int play(void* data,int len,int f
 static float get_delay(void)
 {
 	float result;
-	
+
 	mp_msg(MSGT_AO, MSGL_DBG3, "ao_nas: get_delay()\n");
 
 	pthread_mutex_lock(&nas_data->buffer_mutex);

Modified: trunk/libao2/ao_null.c
==============================================================================
--- trunk/libao2/ao_null.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_null.c	Wed May 13 04:58:57 2009	(r29305)
@@ -27,7 +27,7 @@
 #include "audio_out.h"
 #include "audio_out_internal.h"
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
 	"Null audio output",
 	"null",
@@ -41,14 +41,14 @@ struct	timeval last_tv;
 int	buffer;
 
 static void drain(void){
- 
+
     struct timeval now_tv;
     int temp, temp2;
 
     gettimeofday(&now_tv, 0);
     temp = now_tv.tv_sec - last_tv.tv_sec;
     temp *= ao_data.bps;
-    
+
     temp2 = now_tv.tv_usec - last_tv.tv_usec;
     temp2 /= 1000;
     temp2 *= ao_data.bps;

Modified: trunk/libao2/ao_openal.c
==============================================================================
--- trunk/libao2/ao_openal.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_openal.c	Wed May 13 04:58:57 2009	(r29305)
@@ -42,7 +42,7 @@
 #include "osdep/timer.h"
 #include "subopt-helper.h"
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
   "OpenAL audio output",
   "openal",

Modified: trunk/libao2/ao_oss.c
==============================================================================
--- trunk/libao2/ao_oss.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_oss.c	Wed May 13 04:58:57 2009	(r29305)
@@ -48,7 +48,7 @@
 #include "audio_out.h"
 #include "audio_out_internal.h"
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
 	"OSS/ioctl audio output",
 	"oss",
@@ -199,7 +199,7 @@ static int control(int cmd,void *arg){
 
 	    if(ao_data.format == AF_FORMAT_AC3)
 		return CONTROL_TRUE;
-    
+
 	    if ((fd = open(oss_mixer_device, O_RDONLY)) > 0)
 	    {
 		ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs);
@@ -260,17 +260,17 @@ static int init(int rate,int channels,in
     oss_mixer_device=mdev;
   else
     oss_mixer_device=PATH_DEV_MIXER;
-  
+
   if(mchan){
     int fd, devs, i;
-    
+
     if ((fd = open(oss_mixer_device, O_RDONLY)) == -1){
       mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_OSS_CantOpenMixer,
         oss_mixer_device, strerror(errno));
     }else{
       ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs);
       close(fd);
-      
+
       for (i=0; i<SOUND_MIXER_NRDEVICES; i++){
         if(!strcasecmp(mixer_channels[i], mchan)){
           if(!(devs & (1 << i))){
@@ -308,19 +308,19 @@ static int init(int rate,int channels,in
   if(fcntl(audio_fd, F_SETFL, 0) < 0) {
    mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_OSS_CantMakeFd, strerror(errno));
    return 0;
-  }  
+  }
 #endif
 
 #if defined(FD_CLOEXEC) && defined(F_SETFD)
   fcntl(audio_fd, F_SETFD, FD_CLOEXEC);
 #endif
-  
+
   if(format == AF_FORMAT_AC3) {
     ao_data.samplerate=rate;
     ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
   }
 
-ac3_retry:  
+ac3_retry:
   ao_data.format=format;
   oss_format=format2oss(format);
   if (oss_format == -1) {
@@ -348,7 +348,7 @@ ac3_retry:  
 
   mp_msg(MSGT_AO,MSGL_V,"audio_setup: sample format: %s (requested: %s)\n",
     af_fmt2str_short(ao_data.format), af_fmt2str_short(format));
-  
+
   ao_data.channels = channels;
   if(format != AF_FORMAT_AC3) {
     // We only use SNDCTL_DSP_CHANNELS for >2 channels, in case some drivers don't have it

Modified: trunk/libao2/ao_pcm.c
==============================================================================
--- trunk/libao2/ao_pcm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_pcm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -35,7 +35,7 @@
 #include "help_mp.h"
 
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
     "RAW PCM/WAVE file writer audio output",
     "pcm",
@@ -149,13 +149,13 @@ static int init(int rate,int channels,in
     wavhdr.bytes_per_second = le2me_32(ao_data.bps);
     wavhdr.bits = le2me_16(bits);
     wavhdr.block_align = le2me_16(ao_data.channels * (bits / 8));
-    
+
     wavhdr.data = le2me_32(WAV_ID_DATA);
     wavhdr.data_length=le2me_32(0x7ffff000);
     wavhdr.file_length = wavhdr.data_length + sizeof(wavhdr) - 8;
 
-    mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_PCM_FileInfo, ao_outputfilename, 
-           (ao_pcm_waveheader?"WAVE":"RAW PCM"), rate, 
+    mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_PCM_FileInfo, ao_outputfilename,
+           (ao_pcm_waveheader?"WAVE":"RAW PCM"), rate,
            (channels > 1) ? "Stereo" : "Mono", af_fmt2str_short(format));
     mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_PCM_HintInfo);
 
@@ -166,14 +166,14 @@ static int init(int rate,int channels,in
         }
         return 1;
     }
-    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_PCM_CantOpenOutputFile, 
+    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_PCM_CantOpenOutputFile,
                ao_outputfilename);
     return 0;
 }
 
 // close audio device
 static void uninit(int immed){
-    
+
     if(ao_pcm_waveheader){ /* Rewrite wave header */
         if (fseek(fp, 0, SEEK_SET) != 0)
             mp_msg(MSGT_AO, MSGL_ERR, "Could not seek to start, WAV size headers not updated!\n");
@@ -232,7 +232,7 @@ static int play(void* data,int len,int f
         buffer[i] = le2me_16(buffer[i]);
       }
     }
-#endif 
+#endif
 
     if (ao_data.channels == 6 || ao_data.channels == 5) {
         int frame_size = le2me_16(wavhdr.bits) / 8;
@@ -248,7 +248,7 @@ static int play(void* data,int len,int f
 
     if(ao_pcm_waveheader)
         data_length += len;
-    
+
     return len;
 }
 

Modified: trunk/libao2/ao_sdl.c
==============================================================================
--- trunk/libao2/ao_sdl.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_sdl.c	Wed May 13 04:58:57 2009	(r29305)
@@ -36,7 +36,7 @@
 
 #include "libavutil/fifo.h"
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
 	"SDLlib audio output",
 	"sdl",
@@ -129,7 +129,7 @@ static int init(int rate,int channels,in
 
 	/* SDL Audio Specifications */
 	SDL_AudioSpec aspec, obtained;
-	
+
 	/* Allocate ring-buffer memory */
 	buffer = av_fifo_alloc(BUFFSIZE);
 
@@ -147,7 +147,7 @@ static int init(int rate,int channels,in
 	ao_data.bps=channels*rate;
 	if(format != AF_FORMAT_U8 && format != AF_FORMAT_S8)
 	  ao_data.bps*=2;
-	
+
 	/* The desired audio format (see SDL_AudioSpec) */
 	switch(format) {
 	    case AF_FORMAT_U8:
@@ -200,7 +200,7 @@ void callback(void *userdata, Uint8 *str
 	if(SDL_OpenAudio(&aspec, &obtained) < 0) {
         	mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_SDL_CantOpenAudio, SDL_GetError());
         	return 0;
-	} 
+	}
 
 	/* did we got what we wanted ? */
 	ao_data.channels=obtained.channels;
@@ -233,7 +233,7 @@ void callback(void *userdata, Uint8 *str
 	mp_msg(MSGT_AO,MSGL_V,"SDL: buf size = %d\n",obtained.size);
 	ao_data.buffersize=obtained.size;
 	ao_data.outburst = CHUNK_SIZE;
-	
+
 	/* unsilence audio, if callback is ready */
 	SDL_PauseAudio(0);
 
@@ -253,7 +253,7 @@ static void uninit(int immed){
 // stop playing and empty buffers (for seeking/pause)
 static void reset(void){
 
-	//printf("SDL: reset called!\n");	
+	//printf("SDL: reset called!\n");
 
 	SDL_PauseAudio(1);
 	/* Reset ring-buffer state */
@@ -265,15 +265,15 @@ static void reset(void){
 static void audio_pause(void)
 {
 
-	//printf("SDL: audio_pause called!\n");	
+	//printf("SDL: audio_pause called!\n");
 	SDL_PauseAudio(1);
-	
+
 }
 
 // resume playing, after audio_pause()
 static void audio_resume(void)
 {
-	//printf("SDL: audio_resume called!\n");	
+	//printf("SDL: audio_resume called!\n");
 	SDL_PauseAudio(0);
 }
 
@@ -290,12 +290,12 @@ static int play(void* data,int len,int f
 
 	if (!(flags & AOPLAY_FINAL_CHUNK))
 	len = (len/ao_data.outburst)*ao_data.outburst;
-#if 0	
+#if 0
 	int ret;
 
 	/* Audio locking prohibits call of outputaudio */
 	SDL_LockAudio();
-	// copy audio stream into ring-buffer 
+	// copy audio stream into ring-buffer
 	ret = write_buffer(data, len);
 	SDL_UnlockAudio();
 

Modified: trunk/libao2/ao_sgi.c
==============================================================================
--- trunk/libao2/ao_sgi.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_sgi.c	Wed May 13 04:58:57 2009	(r29305)
@@ -32,7 +32,7 @@
 #include "help_mp.h"
 #include "libaf/af_format.h"
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
 	"sgi audio output",
 	"sgi",
@@ -116,9 +116,9 @@ static int fmt2sgial(int *format, int *w
 
 // to set/get/query special features/parameters
 static int control(int cmd, void *arg){
-  
+
   mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_INFO);
-  
+
   switch(cmd) {
   case AOCONTROL_QUERY_FORMAT:
     /* Do not reject any format: return the closest matching
@@ -139,9 +139,9 @@ static int init(int rate, int channels, 
   smpfmt = fmt2sgial(&format, &smpwidth);
 
   mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_InitInfo, rate, (channels > 1) ? "Stereo" : "Mono", af_fmt2str_short(format));
-  
+
   { /* from /usr/share/src/dmedia/audio/setrate.c */
-  
+
     double frate, realrate;
     ALpv x[2];
 
@@ -152,9 +152,9 @@ static int init(int rate, int channels, 
 	return 0;
       }
     }
-    
+
     frate = rate;
-   
+
     x[0].param = AL_RATE;
     x[0].value.ll = alDoubleToFixed(rate);
     x[1].param = AL_MASTER_CLOCK;
@@ -163,7 +163,7 @@ static int init(int rate, int channels, 
     if (alSetParams(rv,x, 2)<0) {
       mp_msg(MSGT_AO, MSGL_WARN, MSGTR_AO_SGI_CantSetParms_Samplerate, alGetErrorString(oserror()));
     }
-    
+
     if (x[0].sizeOut < 0) {
       mp_msg(MSGT_AO, MSGL_WARN, MSGTR_AO_SGI_CantSetAlRate);
     }
@@ -171,14 +171,14 @@ static int init(int rate, int channels, 
     if (alGetParams(rv,x, 1)<0) {
       mp_msg(MSGT_AO, MSGL_WARN, MSGTR_AO_SGI_CantGetParms, alGetErrorString(oserror()));
     }
-    
+
     realrate = alFixedToDouble(x[0].value.ll);
     if (frate != realrate) {
       mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_SampleRateInfo, realrate, frate);
-    } 
+    }
     sample_rate = (int)realrate;
   }
-  
+
   bytes_per_frame = channels * smpwidth;
 
   ao_data.samplerate = sample_rate;
@@ -187,14 +187,14 @@ static int init(int rate, int channels, 
   ao_data.bps = sample_rate * bytes_per_frame;
   ao_data.buffersize=131072;
   ao_data.outburst = ao_data.buffersize/16;
-  
+
   ao_config = alNewConfig();
-  
+
   if (!ao_config) {
     mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SGI_InitConfigError, alGetErrorString(oserror()));
     return 0;
   }
-  
+
   if(alSetChannels(ao_config, channels) < 0 ||
      alSetWidth(ao_config, smpwidth) < 0 ||
      alSetSampFmt(ao_config, smpfmt) < 0 ||
@@ -203,17 +203,17 @@ static int init(int rate, int channels, 
     mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SGI_InitConfigError, alGetErrorString(oserror()));
     return 0;
   }
-  
+
   ao_port = alOpenPort("mplayer", "w", ao_config);
-  
+
   if (!ao_port) {
     mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SGI_InitOpenAudioFailed, alGetErrorString(oserror()));
     return 0;
   }
-  
+
   // printf("ao_sgi, init: port %d config %d\n", ao_port, ao_config);
   queue_size = alGetQueueSize(ao_config);
-  return 1;  
+  return 1;
 
 }
 
@@ -231,26 +231,26 @@ static void uninit(int immed) {
 
   if (ao_port) {
     if (!immed)
-    while(alGetFilled(ao_port) > 0) sginap(1);  
+    while(alGetFilled(ao_port) > 0) sginap(1);
     alClosePort(ao_port);
     ao_port = NULL;
   }
-	
+
 }
 
 // stop playing and empty buffers (for seeking/pause)
 static void reset(void) {
-  
+
   mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_Reset);
-  
+
   alDiscardFrames(ao_port, queue_size);
 }
 
 // stop playing, keep buffers (for pause)
 static void audio_pause(void) {
-    
+
   mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_PauseInfo);
-    
+
 }
 
 // resume playing, after audio_pause()
@@ -262,12 +262,12 @@ static void audio_resume(void) {
 
 // return: how many bytes can be played without blocking
 static int get_space(void) {
-  
+
   // printf("ao_sgi, get_space: (ao_outburst %d)\n", ao_data.outburst);
   // printf("ao_sgi, get_space: alGetFillable [%d] \n", alGetFillable(ao_port));
-  
+
   return alGetFillable(ao_port) * bytes_per_frame;
-    
+
 }
 
 
@@ -275,7 +275,7 @@ static int get_space(void) {
 // it should round it down to outburst*n
 // return: number of bytes played
 static int play(void* data, int len, int flags) {
-    
+
   /* Always process data in quadword-aligned chunks (64-bits). */
   const int plen = len / (sizeof(uint64_t) * bytes_per_frame);
   const int framecount = plen * sizeof(uint64_t);
@@ -294,14 +294,14 @@ static int play(void* data, int len, int
   alWriteFrames(ao_port, data, framecount);
 
   return framecount * bytes_per_frame;
-  
+
 }
 
 // return: delay in seconds between first and last sample in buffer
 static float get_delay(void){
-  
+
   // printf("ao_sgi, get_delay: (ao_buffersize %d)\n", ao_buffersize);
-  
+
   // return  (float)queue_size/((float)sample_rate);
   const int outstanding = alGetFilled(ao_port);
   return (float)((outstanding < 0) ? queue_size : outstanding) /

Modified: trunk/libao2/ao_sun.c
==============================================================================
--- trunk/libao2/ao_sun.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_sun.c	Wed May 13 04:58:57 2009	(r29305)
@@ -49,7 +49,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
     "Sun audio output",
     "sun",
@@ -142,7 +142,7 @@ static int realtime_samplecounter_availa
     silence = calloc(1, len);
     if (silence == NULL)
 	goto error;
-    
+
     if ((fd = open(dev, O_WRONLY)) < 0)
 	goto error;
 
@@ -157,7 +157,7 @@ static int realtime_samplecounter_availa
 	    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_RtscSetinfoFailed);
 	goto error;
     }
-    
+
     if (write(fd, silence, len) != len) {
 	if ( mp_msg_test(MSGT_AO,MSGL_V) )
 	    mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_RtscWriteFailed);
@@ -215,7 +215,7 @@ static int realtime_samplecounter_availa
      * sample counter increment from the soundcard driver of less than
      * 2000 samples,  we assume that the driver provides a useable realtime
      * sample counter in the AUDIO_INFO play.samples field.  Timing based
-     * on sample counts should be much more accurate than counting whole 
+     * on sample counts should be much more accurate than counting whole
      * 16kbyte chunks.
      */
     if (min_increment < 2000)
@@ -225,7 +225,7 @@ static int realtime_samplecounter_availa
 	mp_msg(MSGT_AO,MSGL_V,"ao_sun: minimum sample counter increment per 10msec interval: %d\n"
 	       "\t%susing sample counter based timing code\n",
 	       min_increment, rtsc_ok == RTSC_ENABLED ? "" : "not ");
-    
+
 
 error:
     if (silence != NULL) free(silence);
@@ -272,7 +272,7 @@ find_close_samplerate_match(int dev, uns
 
     if (sr->flags & MIXER_SR_LIMITS) {
 	/*
-	 * HW can playback any rate between 
+	 * HW can playback any rate between
 	 * sr->samp_rates[0] .. sr->samp_rates[1]
 	 */
 	free(sr);
@@ -318,7 +318,7 @@ find_close_samplerate_match(int dev, uns
     for (i = 0; audiocs_rates[i]; i++) {
 	err = abs(audiocs_rates[i] - sample_rate);
 	if (err == 0) {
-	    /* 
+	    /*
 	     * exact supported sample rate match, no need to
 	     * retry something elise
 	     */
@@ -361,7 +361,7 @@ find_highest_samplerate(int dev)
 
     if (sr->flags & MIXER_SR_LIMITS) {
 	/*
-	 * HW can playback any rate between 
+	 * HW can playback any rate between
 	 * sr->samp_rates[0] .. sr->samp_rates[1]
 	 */
 	max_rate = sr->samp_rates[1];
@@ -435,7 +435,7 @@ static int control(int cmd,void *arg){
 	    }
 	    close( fd );
 	    return CONTROL_OK;
-	}	
+	}
 	return CONTROL_ERROR;
     }
     case AOCONTROL_SET_VOLUME:
@@ -466,7 +466,7 @@ static int control(int cmd,void *arg){
 	    ioctl( fd,AUDIO_SETINFO,&info );
 	    close( fd );
 	    return CONTROL_OK;
-	}	
+	}
 	return CONTROL_ERROR;
     }
     }
@@ -516,7 +516,7 @@ static int init(int rate,int channels,in
 
 	if (pass & 1) {
 	    /*
-	     * on some sun audio drivers, 8-bit unsigned LINEAR8 encoding is 
+	     * on some sun audio drivers, 8-bit unsigned LINEAR8 encoding is
 	     * not supported, but 8-bit signed encoding is.
 	     *
 	     * Try S8, and if it works, use our own U8->S8 conversion before
@@ -539,7 +539,7 @@ static int init(int rate,int channels,in
 	     * supported rates,  use the fixed supported rate instead.
 	     */
 	    if (!(info.play.sample_rate =
-		  find_close_samplerate_match(audio_fd, rate))) 
+		  find_close_samplerate_match(audio_fd, rate)))
 	      continue;
 
 	    /*

Modified: trunk/libao2/ao_v4l2.c
==============================================================================
--- trunk/libao2/ao_v4l2.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_v4l2.c	Wed May 13 04:58:57 2009	(r29305)
@@ -38,7 +38,7 @@
 
 static int freq = 0;
 
-static const ao_info_t info = 
+static const ao_info_t info =
 {
   "V4L2 MPEG Audio Decoder output",
   "v4l2",
@@ -70,7 +70,7 @@ init (int rate, int channels, int format
             "AO: [v4l2] can only handle MPEG audio streams.\n");
     return 0;
   }
-  
+
   ao_data.outburst = 2048;
   ao_data.samplerate = rate;
   ao_data.channels = channels;
@@ -129,11 +129,11 @@ get_space (void)
   x = (float) (vo_pts - ao_data.pts) / 90000.0;
   if (x <= 0)
     return 0;
-  
+
   y  = freq * 4 * x;
   y /= ao_data.outburst;
   y *= ao_data.outburst;
-  
+
   if (y > 32000)
     y = 32000;
 
@@ -145,7 +145,7 @@ static int
 play (void *data, int len, int flags)
 {
   int v4l2_write (unsigned char *data, int len);
-  
+
   if (ao_data.format != AF_FORMAT_MPEG2)
     return 0;
 

Modified: trunk/libao2/ao_win32.c
==============================================================================
--- trunk/libao2/ao_win32.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/ao_win32.c	Wed May 13 04:58:57 2009	(r29305)
@@ -200,7 +200,7 @@ static int init(int rate,int channels,in
     }
 
     wformat.Format.nAvgBytesPerSec = wformat.Format.nSamplesPerSec * wformat.Format.nBlockAlign;
- 
+
     //open sound device
     //WAVE_MAPPER always points to the default wave device on the system
     result = waveOutOpen(&hWaveOut,WAVE_MAPPER,(WAVEFORMATEX*)&wformat,(DWORD_PTR)waveOutProc,0,CALLBACK_FUNCTION);

Modified: trunk/libao2/audio_out.h
==============================================================================
--- trunk/libao2/audio_out.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libao2/audio_out.h	Wed May 13 04:58:57 2009	(r29305)
@@ -53,8 +53,8 @@ typedef struct ao_data_s
   int channels;
   int format;
   int bps;
-  int outburst; 	  
-  int buffersize;         
+  int outburst;
+  int buffersize;
   int pts;
 } ao_data_t;
 

Modified: trunk/libass/ass.c
==============================================================================
--- trunk/libass/ass.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass.c	Wed May 13 04:58:57 2009	(r29305)
@@ -56,7 +56,7 @@ struct parser_priv_s {
 
 void ass_free_track(ass_track_t* track) {
 	int i;
-	
+
 	if (track->parser_priv) {
 		if (track->parser_priv->fontname)
 			free(track->parser_priv->fontname);
@@ -85,14 +85,14 @@ void ass_free_track(ass_track_t* track) 
 /// \return style id
 int ass_alloc_style(ass_track_t* track) {
 	int sid;
-	
+
 	assert(track->n_styles <= track->max_styles);
 
 	if (track->n_styles == track->max_styles) {
 		track->max_styles += ASS_STYLES_ALLOC;
 		track->styles = (ass_style_t*)realloc(track->styles, sizeof(ass_style_t)*track->max_styles);
 	}
-	
+
 	sid = track->n_styles++;
 	memset(track->styles + sid, 0, sizeof(ass_style_t));
 	return sid;
@@ -103,14 +103,14 @@ int ass_alloc_style(ass_track_t* track) 
 /// \return event id
 int ass_alloc_event(ass_track_t* track) {
 	int eid;
-	
+
 	assert(track->n_events <= track->max_events);
 
 	if (track->n_events == track->max_events) {
 		track->max_events += ASS_EVENTS_ALLOC;
 		track->events = (ass_event_t*)realloc(track->events, sizeof(ass_event_t)*track->max_events);
 	}
-	
+
 	eid = track->n_events++;
 	memset(track->events + eid, 0, sizeof(ass_event_t));
 	return eid;
@@ -217,7 +217,7 @@ static int numpad2align(int val) {
 		if (target->name != NULL) free(target->name); \
 		target->name = strdup(token); \
 		mp_msg(MSGT_ASS, MSGL_DBG2, "%s = %s\n", #name, token);
-		
+
 #define COLORVAL(name) ANYVAL(name,string2color)
 #define INTVAL(name) ANYVAL(name,atoi)
 #define FPVAL(name) ANYVAL(name,atof)
@@ -261,7 +261,7 @@ static char* next_token(char** str) {
  * \param event parsed data goes here
  * \param str string to parse, zero-terminated
  * \param n_ignored number of format options to skip at the beginning
-*/ 
+*/
 static int process_event_tail(ass_track_t* track, ass_event_t* event, char* str, int n_ignored)
 {
 	char* token;
@@ -329,9 +329,9 @@ void process_force_style(ass_track_t* tr
 	ass_style_t* target;
 	int sid;
 	char** list = track->library->style_overrides;
-	
+
 	if (!list) return;
-	
+
 	for (fs = list; *fs; ++fs) {
 		eq = strrchr(*fs, '=');
 		if (!eq)
@@ -398,7 +398,7 @@ void process_force_style(ass_track_t* tr
  * \param track track
  * \param str string to parse, zero-terminated
  * Allocates a new style struct.
-*/ 
+*/
 static int process_style(ass_track_t* track, char *str)
 {
 
@@ -426,9 +426,9 @@ static int process_style(ass_track_t* tr
 	}
 
 	q = format = strdup(track->style_format);
-	
+
 	mp_msg(MSGT_ASS, MSGL_V, "[%p] Style: %s\n", track, str);
-	
+
 	sid = ass_alloc_style(track);
 
 	style = track->styles + sid;
@@ -436,13 +436,13 @@ static int process_style(ass_track_t* tr
 // fill style with some default values
 	style->ScaleX = 100.;
 	style->ScaleY = 100.;
-	
+
 	while (1) {
 		NEXT(q, tname);
 		NEXT(p, token);
-		
+
 //		ALIAS(TertiaryColour,OutlineColour) // ignore TertiaryColour; it appears only in SSA, and is overridden by BackColour
-			
+
 		if (0) { // cool ;)
 			STRVAL(Name)
 				if ((strcmp(target->Name, "Default")==0) || (strcmp(target->Name, "*Default")==0))
@@ -494,7 +494,7 @@ static int process_style(ass_track_t* tr
 	}
 	free(format);
 	return 0;
-	
+
 }
 
 static int process_styles_line(ass_track_t* track, char *str)
@@ -541,7 +541,7 @@ static int process_events_line(ass_track
 		// called directly from demuxer
 		int eid;
 		ass_event_t* event;
-		
+
 		str += 9;
 		skip_spaces(&str);
 
@@ -600,7 +600,7 @@ static int decode_font(ass_track_t* trac
 	}
 	dsize = q - buf;
 	assert(dsize <= size / 4 * 3 + 2);
-	
+
 	if (track->library->extract_fonts) {
 		ass_add_font(track->library, track->parser_priv->fontname, (char*)buf, dsize);
 		buf = 0;
@@ -631,7 +631,7 @@ static int process_fonts_line(ass_track_
 		mp_msg(MSGT_ASS, MSGL_V, "fontname: %s\n", track->parser_priv->fontname);
 		return 0;
 	}
-	
+
 	if (!track->parser_priv->fontname) {
 		mp_msg(MSGT_ASS, MSGL_V, "Not understood: %s  \n", str);
 		return 0;
@@ -648,7 +648,7 @@ static int process_fonts_line(ass_track_
 	}
 	memcpy(track->parser_priv->fontdata + track->parser_priv->fontdata_used, str, len);
 	track->parser_priv->fontdata_used += len;
-	
+
 	return 0;
 }
 
@@ -656,7 +656,7 @@ static int process_fonts_line(ass_track_
  * \brief Parse a header line
  * \param track track
  * \param str string to parse, zero-terminated
-*/ 
+*/
 static int process_line(ass_track_t* track, char *str)
 {
 	if (!strncasecmp(str, "[Script Info]", 13)) {
@@ -778,7 +778,7 @@ static int check_duplicate_event(ass_tra
  * \param size length of data
  * \param timecode starting time of the event (milliseconds)
  * \param duration duration of the event (milliseconds)
-*/ 
+*/
 void ass_process_chunk(ass_track_t* track, char *data, int size, long long timecode, long long duration)
 {
 	char* str;
@@ -791,7 +791,7 @@ void ass_process_chunk(ass_track_t* trac
 		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_EventFormatHeaderMissing);
 		return;
 	}
-	
+
 	str = malloc(size + 1);
 	memcpy(str, data, size);
 	str[size] = '\0';
@@ -801,8 +801,8 @@ void ass_process_chunk(ass_track_t* trac
 	event = track->events + eid;
 
 	p = str;
-	
-	do { 
+
+	do {
 		NEXT(p, token);
 		event->ReadOrder = atoi(token);
 		if (check_duplicate_event(track, event->ReadOrder))
@@ -815,7 +815,7 @@ void ass_process_chunk(ass_track_t* trac
 
 		event->Start = timecode;
 		event->Duration = duration;
-		
+
 		free(str);
 		return;
 //		dump_events(tid);
@@ -863,11 +863,11 @@ static char* sub_recode(char* data, size
 		char* op;
 		size_t rc;
 		int clear = 0;
-		
+
 		outbuf = malloc(osize);
 		ip = data;
 		op = outbuf;
-		
+
 		while (1) {
 			if (ileft)
 				rc = iconv(icdsc, &ip, &ileft, &op, &oleft);
@@ -898,7 +898,7 @@ static char* sub_recode(char* data, size
 		icdsc = (iconv_t)(-1);
 		mp_msg(MSGT_ASS,MSGL_V,"LIBSUB: closed iconv descriptor.\n");
 	}
-	
+
 	return outbuf;
 }
 #endif // ICONV
@@ -927,7 +927,7 @@ static char* read_file(char* fname, size
 		fclose(fp);
 		return 0;
 	}
-	
+
 	sz = ftell(fp);
 	rewind(fp);
 
@@ -936,9 +936,9 @@ static char* read_file(char* fname, size
 		fclose(fp);
 		return 0;
 	}
-	
+
 	mp_msg(MSGT_ASS, MSGL_V, "file size: %ld\n", sz);
-	
+
 	buf = malloc(sz + 1);
 	assert(buf);
 	bytes_read = 0;
@@ -954,7 +954,7 @@ static char* read_file(char* fname, size
 	} while (sz - bytes_read > 0);
 	buf[sz] = '\0';
 	fclose(fp);
-	
+
 	if (bufsize)
 		*bufsize = sz;
 	return buf;
@@ -967,9 +967,9 @@ static ass_track_t* parse_memory(ass_lib
 {
 	ass_track_t* track;
 	int i;
-	
+
 	track = ass_new_track(library);
-	
+
 	// process header
 	process_text(track, buf);
 
@@ -998,15 +998,15 @@ static ass_track_t* parse_memory(ass_lib
  * \param bufsize size of buffer
  * \param codepage recode buffer contents from given codepage
  * \return newly allocated track
-*/ 
+*/
 ass_track_t* ass_read_memory(ass_library_t* library, char* buf, size_t bufsize, char* codepage)
 {
 	ass_track_t* track;
 	int need_free = 0;
-	
+
 	if (!buf)
 		return 0;
-	
+
 #ifdef CONFIG_ICONV
 	if (codepage)
 		buf = sub_recode(buf, bufsize, codepage);
@@ -1029,7 +1029,7 @@ char* read_file_recode(char* fname, char
 {
 	char* buf;
 	size_t bufsize;
-	
+
 	buf = read_file(fname, &bufsize);
 	if (!buf)
 		return 0;
@@ -1052,7 +1052,7 @@ char* read_file_recode(char* fname, char
  * \param fname file name
  * \param codepage recode buffer contents from given codepage
  * \return newly allocated track
-*/ 
+*/
 ass_track_t* ass_read_file(ass_library_t* library, char* fname, char* codepage)
 {
 	char* buf;
@@ -1066,11 +1066,11 @@ ass_track_t* ass_read_file(ass_library_t
 	free(buf);
 	if (!track)
 		return 0;
-	
+
 	track->name = strdup(fname);
 
 	mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_AddedSubtitleFileFname, fname, track->n_styles, track->n_events);
-	
+
 //	dump_events(forced_tid);
 	return track;
 }
@@ -1111,12 +1111,12 @@ long long ass_step_sub(ass_track_t* trac
 
 	if (movement == 0) return 0;
 	if (track->n_events == 0) return 0;
-	
+
 	if (movement < 0)
 		for (i = 0; (i < track->n_events) && ((long long)(track->events[i].Start + track->events[i].Duration) <= now); ++i) {}
 	else
 		for (i = track->n_events - 1; (i >= 0) && ((long long)(track->events[i].Start) > now); --i) {}
-	
+
 	// -1 and n_events are ok
 	assert(i >= -1); assert(i <= track->n_events);
 	i += movement;

Modified: trunk/libass/ass.h
==============================================================================
--- trunk/libass/ass.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass.h	Wed May 13 04:58:57 2009	(r29305)
@@ -195,7 +195,7 @@ ass_track_t* ass_read_file(ass_library_t
  * \param bufsize size of buffer
  * \param codepage recode buffer contents from given codepage
  * \return newly allocated track
-*/ 
+*/
 ass_track_t* ass_read_memory(ass_library_t* library, char* buf, size_t bufsize, char* codepage);
 /**
  * \brief read styles from file into already initialized track

Modified: trunk/libass/ass_bitmap.c
==============================================================================
--- trunk/libass/ass_bitmap.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_bitmap.c	Wed May 13 04:58:57 2009	(r29305)
@@ -237,7 +237,7 @@ static bitmap_t* fix_outline_and_shadow(
 	unsigned char* g = bm_g->buffer + (t - bm_g->top) * bm_g->w + (l - bm_g->left);
 	unsigned char* o = bm_o->buffer + (t - bm_o->top) * bm_o->w + (l - bm_o->left);
 	unsigned char* s = bm_s->buffer + (t - bm_s->top) * bm_s->w + (l - bm_s->left);
-	
+
 	for (y = 0; y < b - t; ++y) {
 		for (x = 0; x < r - l; ++x) {
 			unsigned char c_g, c_o;
@@ -309,7 +309,7 @@ int glyph_to_bitmap(ass_synth_priv_t* pr
 	if (*bm_o)
 		resize_tmp(priv_blur, (*bm_o)->w, (*bm_o)->h);
 	resize_tmp(priv_blur, (*bm_g)->w, (*bm_g)->h);
-	
+
 	if (be) {
 		while (be--) {
 			if (*bm_o)

Modified: trunk/libass/ass_cache.c
==============================================================================
--- trunk/libass/ass_cache.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_cache.c	Wed May 13 04:58:57 2009	(r29305)
@@ -117,7 +117,7 @@ void hashmap_done(hashmap_t* map)
 	if (map->count > 0 || map->hit_count + map->miss_count > 0)
 		mp_msg(MSGT_ASS, MSGL_V, "cache statistics: \n  total accesses: %d\n  hits: %d\n  misses: %d\n  object count: %d\n",
 		       map->hit_count + map->miss_count, map->hit_count, map->miss_count, map->count);
-	
+
 	for (i = 0; i < map->nbuckets; ++i) {
 		hashmap_item_t* item = map->root[i];
 		while (item) {
@@ -254,7 +254,7 @@ void* cache_add_bitmap(bitmap_hash_key_t
  * \brief Get a bitmap from bitmap cache.
  * \param key hash key
  * \return requested hash val or 0 if not found
-*/ 
+*/
 bitmap_hash_val_t* cache_find_bitmap(bitmap_hash_key_t* key)
 {
 	return hashmap_find(bitmap_cache, key);
@@ -302,7 +302,7 @@ void* cache_add_glyph(glyph_hash_key_t* 
  * \brief Get a glyph from glyph cache.
  * \param key hash key
  * \return requested hash val or 0 if not found
-*/ 
+*/
 glyph_hash_val_t* cache_find_glyph(glyph_hash_key_t* key)
 {
 	return hashmap_find(glyph_cache, key);

Modified: trunk/libass/ass_cache.h
==============================================================================
--- trunk/libass/ass_cache.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_cache.h	Wed May 13 04:58:57 2009	(r29305)
@@ -49,7 +49,7 @@ typedef struct bitmap_hash_key_s {
 	int shift_x, shift_y; // shift vector that was added to glyph before applying rotation
 	                      // = 0, if frx = fry = frx = 0
 	                      // = (glyph base point) - (rotation origin), otherwise
-	
+
 	FT_Vector advance; // subpixel shift vector
 } bitmap_hash_key_t;
 
@@ -110,7 +110,7 @@ glyph_hash_val_t* cache_find_glyph(glyph
 void ass_glyph_cache_reset(void);
 void ass_glyph_cache_done(void);
 
-typedef struct hashmap_s hashmap_t; 
+typedef struct hashmap_s hashmap_t;
 typedef void (*hashmap_item_dtor_t)(void* key, size_t key_size, void* value, size_t value_size);
 typedef int (*hashmap_key_compare_t)(void* key1, void* key2, size_t key_size);
 typedef unsigned (*hashmap_hash_t)(void* key, size_t key_size);

Modified: trunk/libass/ass_font.c
==============================================================================
--- trunk/libass/ass_font.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_font.c	Wed May 13 04:58:57 2009	(r29305)
@@ -121,10 +121,10 @@ static int add_face(void* fc_priv, ass_f
 	FT_Face face;
 	int error;
 	int mem_idx;
-	
+
 	if (font->n_faces == ASS_FONT_MAX_FACES)
 		return -1;
-	
+
 	path = fontconfig_select(fc_priv, font->desc.family, font->desc.treat_family_as_pattern, font->desc.bold,
 					      font->desc.italic, &index, ch);
 
@@ -145,7 +145,7 @@ static int add_face(void* fc_priv, ass_f
 	}
 	charmap_magic(face);
 	buggy_font_workaround(face);
-	
+
 	font->faces[font->n_faces++] = face;
 	update_transform(font);
 	face_set_size(face, font->size);
@@ -164,7 +164,7 @@ ass_font_t* ass_font_new(ass_library_t* 
 	fontp = ass_font_cache_find(desc);
 	if (fontp)
 		return fontp;
-	
+
 	font.library = library;
 	font.ftlibrary = ftlibrary;
 	font.n_faces = 0;
@@ -256,7 +256,7 @@ void ass_font_get_asc_desc(ass_font_t* f
 			return;
 		}
 	}
-	
+
 	*asc = *desc = 0;
 }
 
@@ -308,18 +308,18 @@ FT_Glyph ass_font_get_glyph(void* fontco
 	case ASS_HINTING_NORMAL: flags = FT_LOAD_FORCE_AUTOHINT; break;
 	case ASS_HINTING_NATIVE: flags = 0; break;
 	}
-	
+
 	error = FT_Load_Glyph(face, index, FT_LOAD_NO_BITMAP | flags);
 	if (error) {
 		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorLoadingGlyph);
 		return 0;
 	}
-	
+
 #if (FREETYPE_MAJOR > 2) || \
     ((FREETYPE_MAJOR == 2) && (FREETYPE_MINOR >= 2)) || \
     ((FREETYPE_MAJOR == 2) && (FREETYPE_MINOR == 1) && (FREETYPE_PATCH >= 10))
 // FreeType >= 2.1.10 required
-	if (!(face->style_flags & FT_STYLE_FLAG_ITALIC) && 
+	if (!(face->style_flags & FT_STYLE_FLAG_ITALIC) &&
 			(font->desc.italic > 55)) {
 		FT_GlyphSlot_Oblique(face->glyph);
 	}
@@ -329,7 +329,7 @@ FT_Glyph ass_font_get_glyph(void* fontco
 		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorLoadingGlyph);
 		return 0;
 	}
-	
+
 	return glyph;
 }
 

Modified: trunk/libass/ass_fontconfig.c
==============================================================================
--- trunk/libass/ass_fontconfig.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_fontconfig.c	Wed May 13 04:58:57 2009	(r29305)
@@ -72,7 +72,7 @@ struct fc_instance_s {
  * \param index out: font index inside a file
  * \param code: the character that should be present in the font, can be 0
  * \return font file path
-*/ 
+*/
 static char* _select_font(fc_instance_t* priv, const char* family, int treat_family_as_pattern,
 			  unsigned bold, unsigned italic, int* index, uint32_t code)
 {
@@ -87,7 +87,7 @@ static char* _select_font(fc_instance_t*
 	int curf;
 	char* retval = NULL;
 	int family_cnt;
-	
+
 	*index = 0;
 
 	if (treat_family_as_pattern)
@@ -97,7 +97,7 @@ static char* _select_font(fc_instance_t*
 
 	if (!pat)
 		goto error;
-	
+
 	if (!treat_family_as_pattern) {
 		FcPatternAddString(pat, FC_FAMILY, (const FcChar8*)family);
 
@@ -130,7 +130,7 @@ static char* _select_font(fc_instance_t*
 	FcPatternAddInteger(pat, FC_WEIGHT, bold);
 
 	FcDefaultSubstitute(pat);
-	
+
 	rc = FcConfigSubstitute(priv->config, pat, FcMatchPattern);
 	if (!rc)
 		goto error;
@@ -235,7 +235,7 @@ static char* _select_font(fc_instance_t*
  * \param index out: font index inside a file
  * \param code: the character that should be present in the font, can be 0
  * \return font file path
-*/ 
+*/
 char* fontconfig_select(fc_instance_t* priv, const char* family, int treat_family_as_pattern,
 			unsigned bold, unsigned italic, int* index, uint32_t code)
 {
@@ -249,23 +249,23 @@ char* fontconfig_select(fc_instance_t* p
 	if (!res && priv->family_default) {
 		res = _select_font(priv, priv->family_default, 0, bold, italic, index, code);
 		if (res)
-			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingDefaultFontFamily, 
+			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingDefaultFontFamily,
 					family, bold, italic, res, *index);
 	}
 	if (!res && priv->path_default) {
 		res = priv->path_default;
 		*index = priv->index_default;
-		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingDefaultFont, 
+		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingDefaultFont,
 		       family, bold, italic, res, *index);
 	}
 	if (!res) {
 		res = _select_font(priv, "Arial", 0, bold, italic, index, code);
 		if (res)
-			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingArialFontFamily, 
+			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingArialFontFamily,
 					family, bold, italic, res, *index);
 	}
 	if (res)
-		mp_msg(MSGT_ASS, MSGL_V, "fontconfig_select: (%s, %d, %d) -> %s, %d\n", 
+		mp_msg(MSGT_ASS, MSGL_V, "fontconfig_select: (%s, %d, %d) -> %s, %d\n",
 				family, bold, italic, res, *index);
 	return res;
 }
@@ -316,7 +316,7 @@ static char* validate_fname(char* name)
  * \param idx index of the processed font in library->fontdata
  * With FontConfig >= 2.4.2, builds a font pattern in memory via FT_New_Memory_Face/FcFreeTypeQueryFace.
  * With older FontConfig versions, save the font to ~/.mplayer/fonts.
-*/ 
+*/
 static void process_fontdata(fc_instance_t* priv, ass_library_t* library, FT_Library ftlibrary, int idx)
 {
 	int rc;
@@ -347,7 +347,7 @@ static void process_fontdata(fc_instance
 	} else if (!S_ISDIR(st.st_mode)) {
 		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_NotADirectory, fonts_dir);
 	}
-	
+
 	fname = validate_fname((char*)name);
 
 	snprintf(buf, 1000, "%s/%s", fonts_dir, fname);
@@ -407,14 +407,14 @@ static void process_fontdata(fc_instance
  * \param family default font family
  * \param path default font path
  * \return pointer to fontconfig private data
-*/ 
+*/
 fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, const char* family, const char* path, int fc)
 {
 	int rc;
 	fc_instance_t* priv = calloc(1, sizeof(fc_instance_t));
 	const char* dir = library->fonts_dir;
 	int i;
-	
+
 	if (!fc) {
 		mp_msg(MSGT_ASS, MSGL_WARN,
 		       MSGTR_LIBASS_FontconfigDisabledDefaultFontWillBeUsed);
@@ -497,9 +497,9 @@ fc_instance_t* fontconfig_init(ass_libra
 	fc_instance_t* priv;
 
 	mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FontconfigDisabledDefaultFontWillBeUsed);
-	
+
 	priv = calloc(1, sizeof(fc_instance_t));
-	
+
 	priv->path_default = strdup(path);
 	priv->index_default = 0;
 	return priv;

Modified: trunk/libass/ass_library.c
==============================================================================
--- trunk/libass/ass_library.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_library.c	Wed May 13 04:58:57 2009	(r29305)
@@ -62,13 +62,13 @@ void ass_set_style_overrides(ass_library
 	char** p;
 	char** q;
 	int cnt;
-	
+
 	if (priv->style_overrides) {
 		for (p = priv->style_overrides; *p; ++p)
 			free(*p);
 		free(priv->style_overrides);
 	}
-	
+
 	if (!list) return;
 
 	for (p = list, cnt = 0; *p; ++p, ++cnt) {}
@@ -91,14 +91,14 @@ void ass_add_font(ass_library_t* priv, c
 	if (!name || !data || !size)
 		return;
 	grow_array((void**)&priv->fontdata, priv->num_fontdata, sizeof(*priv->fontdata));
-	
+
 	priv->fontdata[idx].name = strdup(name);
-	
+
 	priv->fontdata[idx].data = malloc(size);
 	memcpy(priv->fontdata[idx].data, data, size);
-	
+
 	priv->fontdata[idx].size = size;
-	
+
 	priv->num_fontdata ++;
 }
 

Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_mp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -191,7 +191,7 @@ int ass_process_subtitle(ass_track_t* tr
 
 	mp_msg(MSGT_ASS, MSGL_V, "plaintext event at %" PRId64 ", +%" PRId64 ": %s  \n",
 			(int64_t)event->Start, (int64_t)event->Duration, event->Text);
-	
+
 	return eid;
 }
 

Modified: trunk/libass/ass_render.c
==============================================================================
--- trunk/libass/ass_render.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_render.c	Wed May 13 04:58:57 2009	(r29305)
@@ -119,7 +119,7 @@ typedef struct glyph_info_s {
 	double blur; // gaussian blur
 	double shadow;
 	double frx, fry, frz; // rotation
-	
+
 	bitmap_hash_key_t hash_key;
 } glyph_info_t;
 
@@ -141,11 +141,11 @@ typedef struct text_info_s {
 typedef struct render_context_s {
 	ass_event_t* event;
 	ass_style_t* style;
-	
+
 	ass_font_t* font;
 	char* font_path;
 	double font_size;
-	
+
 	FT_Stroker stroker;
 	int alignment; // alignment overrides go here; if zero, style value will be used
 	double frx, fry, frz;
@@ -185,7 +185,7 @@ typedef struct render_context_s {
 	unsigned bold;
 	unsigned italic;
 	int treat_family_as_pattern;
-	
+
 } render_context_t;
 
 // frame-global data
@@ -248,13 +248,13 @@ ass_renderer_t* ass_renderer_init(ass_li
 	FT_Library ft;
 	ass_renderer_t* priv = 0;
 	int vmajor, vminor, vpatch;
-	
+
 	memset(&render_context, 0, sizeof(render_context));
 	memset(&frame_context, 0, sizeof(frame_context));
 	memset(&text_info, 0, sizeof(text_info));
 
 	error = FT_Init_FreeType( &ft );
-	if ( error ) { 
+	if ( error ) {
 		mp_msg(MSGT_ASS, MSGL_FATAL, MSGTR_LIBASS_FT_Init_FreeTypeFailed);
 		goto ass_init_exit;
 	}
@@ -276,14 +276,14 @@ ass_renderer_t* ass_renderer_init(ass_li
 	priv->library = library;
 	priv->ftlibrary = ft;
 	// images_root and related stuff is zero-filled in calloc
-	
+
 	ass_font_cache_init();
 	ass_bitmap_cache_init();
 	ass_composite_cache_init();
 	ass_glyph_cache_init();
 
 	text_info.glyphs = calloc(MAX_GLYPHS, sizeof(glyph_info_t));
-	
+
 ass_init_exit:
 	if (priv) mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_Init);
 	else mp_msg(MSGT_ASS, MSGL_ERR, MSGTR_LIBASS_InitFailed);
@@ -316,7 +316,7 @@ void ass_renderer_done(ass_renderer_t* p
 static ass_image_t* my_draw_bitmap(unsigned char* bitmap, int bitmap_w, int bitmap_h, int stride, int dst_x, int dst_y, uint32_t color)
 {
 	ass_image_t* img = calloc(1, sizeof(ass_image_t));
-	
+
 	img->w = bitmap_w;
 	img->h = bitmap_h;
 	img->stride = stride;
@@ -353,7 +353,7 @@ static ass_image_t** render_glyph(bitmap
 	dst_x += bm->left;
 	dst_y += bm->top;
 	brk -= bm->left;
-	
+
 	// clipping
 	clip_x0 = render_context.clip_x0;
 	clip_y0 = render_context.clip_y0;
@@ -363,7 +363,7 @@ static ass_image_t** render_glyph(bitmap
 	b_y0 = 0;
 	b_x1 = bm->w;
 	b_y1 = bm->h;
-	
+
 	tmp = dst_x - clip_x0;
 	if (tmp < 0) {
 		mp_msg(MSGT_ASS, MSGL_DBG2, "clip left\n");
@@ -384,13 +384,13 @@ static ass_image_t** render_glyph(bitmap
 		mp_msg(MSGT_ASS, MSGL_DBG2, "clip bottom\n");
 		b_y1 = bm->h + tmp;
 	}
-	
+
 	if ((b_y0 >= b_y1) || (b_x0 >= b_x1))
 		return tail;
 
 	if (brk > b_x0) { // draw left part
 		if (brk > b_x1) brk = b_x1;
-		img = my_draw_bitmap(bm->buffer + bm->w * b_y0 + b_x0, 
+		img = my_draw_bitmap(bm->buffer + bm->w * b_y0 + b_x0,
 			brk - b_x0, b_y1 - b_y0, bm->w,
 			dst_x + b_x0, dst_y + b_y0, color);
 		*tail = img;
@@ -398,7 +398,7 @@ static ass_image_t** render_glyph(bitmap
 	}
 	if (brk < b_x1) { // draw right part
 		if (brk < b_x0) brk = b_x0;
-		img = my_draw_bitmap(bm->buffer + bm->w * b_y0 + brk, 
+		img = my_draw_bitmap(bm->buffer + bm->w * b_y0 + brk,
 			b_x1 - brk, b_y1 - b_y0, bm->w,
 			dst_x + brk, dst_y + b_y0, color2);
 		*tail = img;
@@ -541,7 +541,7 @@ static ass_image_t* render_text(text_inf
 		pen_x = dst_x + info->pos.x;
 		pen_y = dst_y + info->pos.y;
 		bm = info->bm_o;
-		
+
 		if ((info->effect_type == EF_KARAOKE_KO) && (info->effect_timing <= info->bbox.xMax)) {
 			// do nothing
 		} else {
@@ -622,7 +622,7 @@ static int y2scr_sub(double y) {
 static void compute_string_bbox( text_info_t* info, FT_BBox *abbox ) {
 	FT_BBox bbox;
 	int i;
-	
+
 	if (text_info.length > 0) {
 		bbox.xMin = 32000;
 		bbox.xMax = -32000;
@@ -693,7 +693,7 @@ static void update_font(void)
 
 	render_context.font = ass_font_new(priv->library, priv->ftlibrary, priv->fontconfig_priv, &desc);
 	free(desc.family);
-	
+
 	if (render_context.font)
 		change_font_size(render_context.font_size);
 }
@@ -779,7 +779,7 @@ static uint32_t mult_alpha(uint32_t a, u
  * \brief Calculate alpha value by piecewise linear function
  * Used for \fad, \fade implementation.
  */
-static unsigned interpolate_alpha(long long now, 
+static unsigned interpolate_alpha(long long now,
 		long long t1, long long t2, long long t3, long long t4,
 		unsigned a1, unsigned a2, unsigned a3)
 {
@@ -812,7 +812,7 @@ static void reset_render_context(void);
 static char* parse_tag(char* p, double pwr) {
 #define skip_to(x) while ((*p != (x)) && (*p != '}') && (*p != 0)) { ++p;}
 #define skip(x) if (*p == (x)) ++p; else { return p; }
-	
+
 	skip_to('\\');
 	skip('\\');
 	if ((*p == '}') || (*p == 0))
@@ -920,7 +920,7 @@ static char* parse_tag(char* p, double p
 			mystrtoll(&p, &t1);
 			skip(',');
 			mystrtoll(&p, &t2);
-			mp_msg(MSGT_ASS, MSGL_DBG2, "movement6: (%f, %f) -> (%f, %f), (%" PRId64 " .. %" PRId64 ")\n", 
+			mp_msg(MSGT_ASS, MSGL_DBG2, "movement6: (%f, %f) -> (%f, %f), (%" PRId64 " .. %" PRId64 ")\n",
 				x1, y1, x2, y2, (int64_t)t1, (int64_t)t2);
 		} else {
 			t1 = 0;
@@ -1112,7 +1112,7 @@ static char* parse_tag(char* p, double p
 			k = pow(((double)(t - t1)) / delta_t, v3);
 		}
 		while (*p == '\\')
-			p = parse_tag(p, k); // maybe k*pwr ? no, specs forbid nested \t's 
+			p = parse_tag(p, k); // maybe k*pwr ? no, specs forbid nested \t's
 		skip_to(')'); // in case there is some unknown tag or a comment
 		skip(')');
 	} else if (mystrcmp(&p, "clip")) {
@@ -1294,7 +1294,7 @@ static void apply_transition_effects(ass
 	while (cnt < 4 && (p = strchr(p, ';'))) {
 		v[cnt++] = atoi(++p);
 	}
-	
+
 	if (strncmp(event->Effect, "Banner;", 7) == 0) {
 		int delay;
 		if (cnt < 1) {
@@ -1407,7 +1407,7 @@ static void init_render_context(ass_even
 	render_context.effect_type = EF_NONE;
 	render_context.effect_timing = 0;
 	render_context.effect_skip_timing = 0;
-	
+
 	apply_transition_effects(event);
 }
 
@@ -1492,10 +1492,10 @@ static void get_bitmap_glyph(glyph_info_
 {
 	bitmap_hash_val_t* val;
 	bitmap_hash_key_t* key = &info->hash_key;
-	
+
 	val = cache_find_bitmap(key);
 /* 	val = 0; */
-	
+
 	if (val) {
 		info->bm = val->bm;
 		info->bm_o = val->bm_o;
@@ -1602,7 +1602,7 @@ static void wrap_lines_smart(int max_tex
 			break_at = i;
 			mp_msg(MSGT_ASS, MSGL_DBG2, "forced line break at %d\n", break_at);
 		}
-		
+
 		if ((len >= max_text_width) && (frame_context.track->WrapStyle != 2)) {
 			break_type = 1;
 			break_at = last_space;
@@ -1619,7 +1619,7 @@ static void wrap_lines_smart(int max_tex
 			// marking break_at+1 as start of a new line
 			int lead = break_at + 1; // the first symbol of the new line
 			if (text_info.n_lines >= MAX_LINES) {
-				// to many lines ! 
+				// to many lines !
 				// no more linebreaks
 				for (j = lead; j < text_info.length; ++j)
 					text_info.glyphs[j].linebreak = 0;
@@ -1632,7 +1632,7 @@ static void wrap_lines_smart(int max_tex
 			s_offset = s1->bbox.xMin + s1->pos.x;
 			text_info.n_lines ++;
 		}
-		
+
 		if (cur->symbol == ' ')
 			last_space = i;
 
@@ -1678,11 +1678,11 @@ static void wrap_lines_smart(int max_tex
 			if (i == text_info.length)
 				break;
 		}
-		
+
 	}
 	assert(text_info.n_lines >= 1);
 #undef DIFF
-	
+
 	measure_text();
 
 	pen_shift_x = 0;
@@ -1706,7 +1706,7 @@ static void wrap_lines_smart(int max_tex
  * \brief determine karaoke effects
  * Karaoke effects cannot be calculated during parse stage (get_next_char()),
  * so they are done in a separate step.
- * Parse stage: when karaoke style override is found, its parameters are stored in the next glyph's 
+ * Parse stage: when karaoke style override is found, its parameters are stored in the next glyph's
  * (the first glyph of the karaoke word)'s effect_type and effect_timing.
  * This function:
  * 1. sets effect_type for all glyphs in the word (_karaoke_ word)
@@ -1881,7 +1881,7 @@ static void transform_3d(FT_Vector shift
 static int ass_render_event(ass_event_t* event, event_images_t* event_images)
 {
 	char* p;
-	FT_UInt previous; 
+	FT_UInt previous;
 	FT_UInt num_glyphs;
 	FT_Vector pen;
 	unsigned code;
@@ -1917,7 +1917,7 @@ static int ass_render_event(ass_event_t*
 		do {
 			code = get_next_char(&p);
 		} while (code && render_context.drawing_mode); // skip everything in drawing mode
-		
+
 		// face could have been changed in get_next_char
 		if (!render_context.font) {
 			free_render_context();
@@ -1928,7 +1928,7 @@ static int ass_render_event(ass_event_t*
 			break;
 
 		if (text_info.length >= MAX_GLYPHS) {
-			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_MAX_GLYPHS_Reached, 
+			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_MAX_GLYPHS_Reached,
 					(int)(event - frame_context.track->events), event->Start, event->Duration, event->Text);
 			break;
 		}
@@ -1954,14 +1954,14 @@ static int ass_render_event(ass_event_t*
 				       &shift );
 
 		get_outline_glyph(code, text_info.glyphs + text_info.length, &shift);
-		
+
 		text_info.glyphs[text_info.length].pos.x = pen.x >> 6;
 		text_info.glyphs[text_info.length].pos.y = pen.y >> 6;
-		
+
 		pen.x += text_info.glyphs[text_info.length].advance.x;
 		pen.x += double_to_d6(render_context.hspacing);
 		pen.y += text_info.glyphs[text_info.length].advance.y;
-		
+
 		previous = code;
 
 		text_info.glyphs[text_info.length].symbol = code;
@@ -2008,23 +2008,23 @@ static int ass_render_event(ass_event_t*
 		render_context.effect_timing = 0;
 		render_context.effect_skip_timing = 0;
 	}
-	
+
 	if (text_info.length == 0) {
 		// no valid symbols in the event; this can be smth like {comment}
 		free_render_context();
 		return 1;
 	}
-	
+
 	// depends on glyph x coordinates being monotonous, so it should be done before line wrap
 	process_karaoke_effects();
-	
+
 	// alignments
 	alignment = render_context.alignment;
 	halign = alignment & 3;
 	valign = alignment & 12;
 
-	MarginL = (event->MarginL) ? event->MarginL : render_context.style->MarginL; 
-	MarginR = (event->MarginR) ? event->MarginR : render_context.style->MarginR; 
+	MarginL = (event->MarginL) ? event->MarginL : render_context.style->MarginL;
+	MarginR = (event->MarginR) ? event->MarginR : render_context.style->MarginR;
 	MarginV = (event->MarginV) ? event->MarginV : render_context.style->MarginV;
 
 	if (render_context.evt_type != EVENT_HSCROLL) {
@@ -2064,12 +2064,12 @@ static int ass_render_event(ass_event_t*
 	} else { // render_context.evt_type == EVENT_HSCROLL
 		measure_text();
 	}
-	
+
 	// determing text bounding box
 	compute_string_bbox(&text_info, &bbox);
-	
+
 	// determine device coordinates for text
-	
+
 	// x coordinate for everything except positioned events
 	if (render_context.evt_type == EVENT_NORMAL ||
 	    render_context.evt_type == EVENT_VSCROLL) {
@@ -2114,7 +2114,7 @@ static int ass_render_event(ass_event_t*
 		device_x = x2scr_pos(render_context.pos_x) - base_x;
 		device_y = y2scr_pos(render_context.pos_y) - base_y;
 	}
-	
+
 	// fix clip coordinates (they depend on alignment)
 	if (render_context.evt_type == EVENT_NORMAL ||
 	    render_context.evt_type == EVENT_HSCROLL ||
@@ -2141,7 +2141,7 @@ static int ass_render_event(ass_event_t*
 	// calculate rotation parameters
 	{
 		FT_Vector center;
-		
+
 		if (render_context.have_origin) {
 			center.x = x2scr(render_context.org_x);
 			center.y = y2scr(render_context.org_y);
@@ -2178,7 +2178,7 @@ static int ass_render_event(ass_event_t*
 	event_images->imgs = render_text(&text_info, device_x, device_y);
 
 	free_render_context();
-	
+
 	return 0;
 }
 
@@ -2304,7 +2304,7 @@ static int ass_start_frame(ass_renderer_
 
 	if (track->n_events == 0)
 		return 1; // nothing to do
-	
+
 	frame_context.ass_priv = priv;
 	frame_context.width = global_settings->frame_width;
 	frame_context.height = global_settings->frame_height;
@@ -2320,7 +2320,7 @@ static int ass_start_frame(ass_renderer_
 	frame_context.time = now;
 
 	ass_lazy_track_init();
-	
+
 	frame_context.font_scale = global_settings->font_size_coeff *
 	                           frame_context.orig_height / frame_context.track->PlayResY;
 	if (frame_context.track->ScaledBorderAndShadow)
@@ -2430,7 +2430,7 @@ static int fit_segment(segment_t* s, seg
 	fixed[*cnt].b = s->b + shift;
 	(*cnt)++;
 	qsort(fixed, *cnt, sizeof(segment_t), cmp_segment);
-	
+
 	return shift;
 }
 
@@ -2485,7 +2485,7 @@ static void fix_collisions(event_images_
 			priv->top = imgs[i].top;
 			priv->height = imgs[i].height;
 		}
-		
+
 	}
 }
 
@@ -2558,7 +2558,7 @@ ass_image_t* ass_render_frame(ass_render
 	int i, cnt, rc;
 	event_images_t* last;
 	ass_image_t** tail;
-	
+
 	// init frame
 	rc = ass_start_frame(priv, track, now);
 	if (rc != 0)
@@ -2604,7 +2604,7 @@ ass_image_t* ass_render_frame(ass_render
 
 	if (detect_change)
 		*detect_change = ass_detect_change(priv);
-	
+
 	// free the previous image list
 	ass_free_images(priv->prev_images_root);
 	priv->prev_images_root = 0;

Modified: trunk/libass/ass_types.h
==============================================================================
--- trunk/libass/ass_types.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_types.h	Wed May 13 04:58:57 2009	(r29305)
@@ -100,7 +100,7 @@ typedef struct ass_track_s {
 	char* event_format; // event format line
 
 	enum {TRACK_TYPE_UNKNOWN = 0, TRACK_TYPE_ASS, TRACK_TYPE_SSA} track_type;
-	
+
 	// script header fields
 	int PlayResX;
 	int PlayResY;
@@ -108,7 +108,7 @@ typedef struct ass_track_s {
 	int WrapStyle;
 	char ScaledBorderAndShadow;
 
-	
+
 	int default_style; // index of default style
 	char* name; // file name in case of external subs, 0 for streams
 

Modified: trunk/libass/ass_utils.c
==============================================================================
--- trunk/libass/ass_utils.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libass/ass_utils.c	Wed May 13 04:58:57 2009	(r29305)
@@ -72,17 +72,17 @@ int strtocolor(char** q, uint32_t* res)
 	uint32_t color = 0;
 	int result;
 	char* p = *q;
-	
-	if (*p == '&') ++p; 
+
+	if (*p == '&') ++p;
 	else mp_msg(MSGT_ASS, MSGL_DBG2, "suspicious color format: \"%s\"\n", p);
-	
-	if (*p == 'H' || *p == 'h') { 
+
+	if (*p == 'H' || *p == 'h') {
 		++p;
 		result = mystrtou32(&p, 16, &color);
 	} else {
 		result = mystrtou32(&p, 0, &color);
 	}
-	
+
 	{
 		unsigned char* tmp = (unsigned char*)(&color);
 		unsigned char b;

Modified: trunk/libmenu/menu.c
==============================================================================
--- trunk/libmenu/menu.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu.c	Wed May 13 04:58:57 2009	(r29305)
@@ -59,7 +59,7 @@ menu_info_t* menu_info_list[] = {
   &menu_info_console,
 #ifdef CONFIG_DVBIN
   &menu_info_dvbsel,
-#endif  
+#endif
   &menu_info_pref,
   NULL
 };
@@ -222,7 +222,7 @@ static int menu_parse_config(char* buffe
   }
 
 }
-      
+
 
 /// This will build the menu_defs list from the cfg file
 #define BUF_STEP 1024
@@ -552,7 +552,7 @@ void menu_draw_text_full(mp_image_t* mpi
   // Find the first line
   if(align & MENU_TEXT_VCENTER)
     sy = ymin + ((h - need_h)/2);
-  else if(align & MENU_TEXT_BOT) 
+  else if(align & MENU_TEXT_BOT)
     sy = ymax - need_h - 1;
   else
     sy = y;
@@ -564,7 +564,7 @@ void menu_draw_text_full(mp_image_t* mpi
   else if(align & MENU_TEXT_RIGHT)
     sx = xmax - need_w;
 #endif
-  
+
   xmid = xmin + (xmax - xmin) / 2;
   xrmin = xmin;
   // Clamp the bb to the mpi size
@@ -572,7 +572,7 @@ void menu_draw_text_full(mp_image_t* mpi
   if(xmin < 0) xmin = 0;
   if(ymax > mpi->h) ymax = mpi->h;
   if(xmax > mpi->w) xmax = mpi->w;
-  
+
   // Jump some the beginnig text if needed
   while(sy < ymin && *txt) {
     int c=utf8_get_char((const char**)&txt);
@@ -672,7 +672,7 @@ void menu_draw_text_full(mp_image_t* mpi
     sy += vo_font->height + vspace;
   }
 }
-	  
+
 int menu_text_length(char* txt) {
   int l = 0;
   render_txt(txt);
@@ -704,7 +704,7 @@ void menu_text_size(char* txt,int max_wi
     i -= vo_font->charspace;
     if (i > w) w = i;
   }
-  
+
   *_w = w;
   *_h = (l-1) * (vo_font->height + vspace) + vo_font->height;
 }
@@ -724,7 +724,7 @@ int menu_text_num_lines(char* txt, int m
   }
   return l;
 }
-  
+
 char* menu_text_get_next_line(char* txt, int max_width) {
   int i = 0;
   render_txt(txt);
@@ -746,22 +746,22 @@ char* menu_text_get_next_line(char* txt,
 void menu_draw_box(mp_image_t* mpi,unsigned char grey,unsigned char alpha, int x, int y, int w, int h) {
   draw_alpha_f draw_alpha = get_draw_alpha(mpi->imgfmt);
   int g;
-  
+
   if(!draw_alpha) {
     mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_UnsupportedOutformat);
     return;
   }
-  
+
   if(x > mpi->w || y > mpi->h) return;
-  
+
   if(x < 0) w += x, x = 0;
   if(x+w > mpi->w) w = mpi->w-x;
   if(y < 0) h += y, y = 0;
   if(y+h > mpi->h) h = mpi->h-y;
-    
+
   g = ((256-alpha)*grey)>>8;
   if(g < 1) g = 1;
-    
+
   {
     int stride = (w+7)&(~7); // round to 8
     char pic[stride*h],pic_alpha[stride*h];
@@ -771,5 +771,5 @@ void menu_draw_box(mp_image_t* mpi,unsig
                mpi->planes[0] + y * mpi->stride[0] + x * (mpi->bpp>>3),
                mpi->stride[0]);
   }
-  
+
 }

Modified: trunk/libmenu/menu.h
==============================================================================
--- trunk/libmenu/menu.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu.h	Wed May 13 04:58:57 2009	(r29305)
@@ -61,7 +61,7 @@ typedef struct menu_info_s {
 #define MENU_CMD_OK 2
 #define MENU_CMD_CANCEL 3
 #define MENU_CMD_LEFT 4
-#define MENU_CMD_RIGHT 5 
+#define MENU_CMD_RIGHT 5
 #define MENU_CMD_ACTION 6
 #define MENU_CMD_HOME 7
 #define MENU_CMD_END 8
@@ -103,7 +103,7 @@ void menu_draw_text(mp_image_t* mpi, cha
 int menu_text_length(char* txt);
 int menu_text_num_lines(char* txt, int max_width);
 
-void menu_text_size(char* txt,int max_width, 
+void menu_text_size(char* txt,int max_width,
 		    int vspace, int warp,
 		    int* _w, int* _h);
 

Modified: trunk/libmenu/menu_chapsel.c
==============================================================================
--- trunk/libmenu/menu_chapsel.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_chapsel.c	Wed May 13 04:58:57 2009	(r29305)
@@ -71,8 +71,8 @@ static m_option_t cfg_fields[] = {
 
 static char *fmt_replace(const char *fmt, const char *chapter_name,
                          const char *start) {
-    static const char ctag[] = "${chapter_name}"; 
-    static const char stag[] = "${start}"; 
+    static const char ctag[] = "${chapter_name}";
+    static const char stag[] = "${start}";
     int l = strlen(fmt);
     int cl = strlen(chapter_name);
     int sl = strlen(start);

Modified: trunk/libmenu/menu_cmdlist.c
==============================================================================
--- trunk/libmenu/menu_cmdlist.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_cmdlist.c	Wed May 13 04:58:57 2009	(r29305)
@@ -122,7 +122,7 @@ static int parse_args(menu_t* menu,char*
       mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_SyntaxErrorAtLine,parser->line);
       asx_parser_free(parser);
       return -1;
-    } else if(r == 0) {      
+    } else if(r == 0) {
       asx_parser_free(parser);
       if(!m)
 	mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_NoEntryFoundInTheMenuDefinition);
@@ -160,7 +160,7 @@ static int open_cmdlist(menu_t* menu, ch
     mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_ListMenuNeedsAnArgument);
     return 0;
   }
- 
+
   menu_list_init(menu);
   if(!parse_args(menu,args))
     return 0;

Modified: trunk/libmenu/menu_console.c
==============================================================================
--- trunk/libmenu/menu_console.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_console.c	Wed May 13 04:58:57 2009	(r29305)
@@ -67,7 +67,7 @@ struct menu_priv_s {
   history_t* history;
   history_t* cur_history;
   int history_size;
-  
+
   char* mp_prompt;
   char* child_prompt;
   int buf_lines; // Buffer size (in line)
@@ -161,11 +161,11 @@ static void add_string(struct menu_priv_
     priv->add_line = 0;
     return;
   }
-  
+
   if(eol) {
     eol[0] = '\0';
     add_string(priv,l);
-    if(eol[1]) { 
+    if(eol[1]) {
       add_line(priv,eol+1);
       priv->add_line = 0;
     } else
@@ -215,7 +215,7 @@ static void draw(menu_t* menu, mp_image_
 
   if(mpriv->bg >= 0)
     menu_draw_box(mpi,mpriv->bg,mpriv->bg_alpha,0,0,mpi->w,h);
-  
+
   if(!mpriv->child || !mpriv->raw_child){
     char input[strlen(mpriv->cur_history->buffer) + strlen(mpriv->prompt) + 1];
     sprintf(input,"%s%s",mpriv->prompt,mpriv->cur_history->buffer);
@@ -259,11 +259,11 @@ static void check_child(menu_t* menu) {
     r = waitpid(mpriv->child,&child_status,WNOHANG);
     if(r < 0){
       if(errno==ECHILD){  ///exiting children get handled in mplayer.c
-        for(i = 0 ; i < 3 ; i++) 
+        for(i = 0 ; i < 3 ; i++)
           close(mpriv->child_fd[i]);
         mpriv->child = 0;
         mpriv->prompt = mpriv->mp_prompt;
-        //add_line(mpriv,"Child process exited");    
+        //add_line(mpriv,"Child process exited");
       }
       else mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_WaitPidError,strerror(errno));
     }
@@ -271,7 +271,7 @@ static void check_child(menu_t* menu) {
     mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_SelectError);
     return;
   }
-  
+
   w = 0;
   for(i = 1 ; i < 3 ; i++) {
     if(FD_ISSET(mpriv->child_fd[i],&rfd)){
@@ -338,7 +338,7 @@ static int run_shell_cmd(menu_t* menu, c
 static void enter_cmd(menu_t* menu) {
   history_t* h;
   char input[strlen(mpriv->cur_history->buffer) + strlen(mpriv->prompt) + 1];
-  
+
   sprintf(input,"%s%s",mpriv->prompt,mpriv->cur_history->buffer);
   add_line(mpriv,input);
 
@@ -360,7 +360,7 @@ static void enter_cmd(menu_t* menu) {
     mpriv->history = h;
   } else
     mpriv->history->buffer[0] = '\0';
-    
+
   mpriv->cur_history = mpriv->history;
   //mpriv->input = mpriv->cur_history->buffer;
 }
@@ -477,7 +477,7 @@ static int openMenu(menu_t* menu, char* 
   mpriv->cur_history = mpriv->history = calloc(1,sizeof(history_t));
   mpriv->cur_history->buffer = calloc(255,1);
   mpriv->cur_history->size = 255;
-  
+
   if(args)
     add_line(mpriv,args);
 

Modified: trunk/libmenu/menu_dvbin.c
==============================================================================
--- trunk/libmenu/menu_dvbin.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_dvbin.c	Wed May 13 04:58:57 2009	(r29305)
@@ -120,17 +120,17 @@ static int fill_channels_menu(menu_t *me
 			elem->p.next 	= NULL;
 			elem->p.txt 	= strdup(channel->name);
 			elem->num 	= n;
-			
+
 			menu_list_add_entry(menu, elem);
 		}
 		else
 		{
-			mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_menu: fill_menu: couldn't malloc %d bytes for menu item: %s, exit\n", 
+			mp_msg(MSGT_DEMUX, MSGL_ERR, "dvb_menu: fill_menu: couldn't malloc %d bytes for menu item: %s, exit\n",
 					sizeof(list_entry_t), strerror(errno));
 			break;
 		}
-	}  
-	
+	}
+
 	return n;
 }
 
@@ -147,23 +147,23 @@ static int fill_cards_menu(menu_t *menu,
 			elem->p.next 	= NULL;
 			elem->p.txt	= strdup(conf->cards[n].name);
 			elem->num 	= n;
-				
+
 			if(n == 0)
 			    elem->p.prev = NULL;
-				
+
 			menu_list_add_entry(menu, elem);
 		}
 		else
 		{
-			fprintf(stderr, "dvb_menu: fill_menu: couldn't malloc %d bytes for menu item: %s, exit\n", 
+			fprintf(stderr, "dvb_menu: fill_menu: couldn't malloc %d bytes for menu item: %s, exit\n",
 				sizeof(list_entry_t), strerror(errno));
 			if(n)
 				return 1;
 
 			return 0;
 		}
-	}  
-	
+	}
+
 	return n;
 }
 
@@ -172,9 +172,9 @@ static int fill_menu(menu_t* menu)
 {
 	list_entry_t* elem;
 	dvb_channels_list  *dvb_list_ptr;
-		
+
 	menu_list_init(menu);
-	
+
 	if(mpriv->config == NULL)
 	{
 		if((elem = calloc(1, sizeof(list_entry_t))) != NULL)
@@ -187,7 +187,7 @@ static int fill_menu(menu_t* menu)
 		}
 		return 0;
 	}
-	
+
 	mpriv->p.title = mpriv->title;
 	if(mpriv->level == 1 && mpriv->config->count > 1)
 		return fill_cards_menu(menu, mpriv->config);
@@ -216,17 +216,17 @@ static void read_cmd(menu_t* menu, int c
 			mpriv->card = mpriv->p.current->num;
 			mpriv->level = 2;
 			menu_list_uninit(menu, free_entry);
-			fill_menu(menu); 
+			fill_menu(menu);
 		}
 		else
 		{
 			dvb_priv_t *dvbp = (dvb_priv_t*) mpriv->config->priv;
 			cmd_name = malloc(25 + strlen(elem->p.txt));
 			if(dvbp != NULL)
-				sprintf(cmd_name, "dvb_set_channel %d %d", elem->num, mpriv->card);	
+				sprintf(cmd_name, "dvb_set_channel %d %d", elem->num, mpriv->card);
 			else
 				sprintf(cmd_name, "loadfile 'dvb://%d@%s'", mpriv->card+1, elem->p.txt);
-		
+
 			c = mp_input_parse_cmd(cmd_name);
 			free(cmd_name);
 			if(c)
@@ -243,7 +243,7 @@ static void read_cmd(menu_t* menu, int c
 	case MENU_CMD_CANCEL:
 	{
 		elem = mpriv->p.current;
-		
+
 		menu_list_uninit(menu, free_entry);
 		if(mpriv->config->count > 1)
 			mpriv->level--;

Modified: trunk/libmenu/menu_filesel.c
==============================================================================
--- trunk/libmenu/menu_filesel.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_filesel.c	Wed May 13 04:58:57 2009	(r29305)
@@ -64,7 +64,7 @@ struct menu_priv_s {
   char* file_action;
   char* dir_action;
   char** actions;
-  char* filter; 
+  char* filter;
 };
 
 static struct menu_priv_s cfg_dflt = {
@@ -104,7 +104,7 @@ static char* replace_path(char* title , 
   if(p) {
     int tl = strlen(title);
     int dl = strlen(dir);
-    int t1l = p-title; 
+    int t1l = p-title;
     int l = tl - 2 + dl;
     char *r, *n, *d = dir;
 
@@ -295,7 +295,7 @@ static int open_dir(menu_t* menu,char* a
         mp_msg(MSGT_GLOBAL,MSGL_ERR,MSGTR_LIBMENU_ReallocError, strerror(errno));
 	n--;
         goto bailout;
-      } 
+      }
       namelist=tp;
     }
 
@@ -305,7 +305,7 @@ static int open_dir(menu_t* menu,char* a
       n--;
       goto bailout;
     }
-     
+
     strcpy(namelist[n], dp->d_name);
     if(S_ISDIR(st.st_mode))
       strcat(namelist[n], "/");
@@ -433,7 +433,7 @@ static int open_fs(menu_t* menu, char* a
     if (!path || path[0] == '\0') {
       struct stat st;
       int path_fp;
-      
+
       path_fp = open (MENU_KEEP_PATH, O_RDONLY);
       if (path_fp >= 0) {
         if (!fstat (path_fp, &st) && (st.st_size > 0)) {
@@ -449,7 +449,7 @@ static int open_fs(menu_t* menu, char* a
       }
     }
   }
-  
+
   getcwd(wd,PATH_MAX);
   if (!path || path[0] == '\0') {
 #if 0
@@ -495,7 +495,7 @@ static int open_fs(menu_t* menu, char* a
 
   return r;
 }
-  
+
 const menu_info_t menu_info_filesel = {
   "File seletor menu",
   "filesel",

Modified: trunk/libmenu/menu_list.c
==============================================================================
--- trunk/libmenu/menu_list.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_list.c	Wed May 13 04:58:57 2009	(r29305)
@@ -87,7 +87,7 @@ void menu_list_draw(menu_t* menu,mp_imag
     if(m) mpriv->current = m;
     else ptr_l = 0;
   }
-  
+
   for(i = 0, m = mpriv->menu ; m ; m = m->next, i++) {
     int ll;
     if(m->hide) continue;
@@ -101,7 +101,7 @@ void menu_list_draw(menu_t* menu,mp_imag
     x += mpriv->minb;
   if(y > 0)
     y += mpriv->minb;
-  else 
+  else
     y = mpriv->minb;
 
   need_h = count * line_h - mpriv->vspace;
@@ -151,7 +151,7 @@ void menu_list_draw(menu_t* menu,mp_imag
 			MENU_TEXT_TOP|(x < 0 ? MENU_TEXT_HCENTER :MENU_TEXT_LEFT));
     dy += th;
   }
-  
+
   dx = x < 0 ? (mpi->w - need_w) / 2 : x;
   bx = x < 0 ? (mpi->w - bg_w) / 2 : x - mpriv->minb;
 
@@ -273,7 +273,7 @@ void menu_list_read_cmd(menu_t* menu,int
         mouse_y >= selection_y && mouse_y < selection_y + selection_h)
       menu_read_cmd(menu, MENU_CMD_OK);
     break;
-  }    
+  }
 }
 
 int menu_list_jump_to_key(menu_t* menu,int c) {
@@ -311,7 +311,7 @@ void menu_list_add_entry(menu_t* menu,li
   l->next = entry;
   entry->prev = l;
 }
-    
+
 void menu_list_init(menu_t* menu) {
   if(!mpriv)
     mpriv = calloc(1,sizeof(struct menu_priv_s));
@@ -328,7 +328,7 @@ void menu_list_uninit(menu_t* menu,free_
     free_func(i);
     i = j;
   }
-  
+
   mpriv->menu = mpriv->current = NULL;
 
 }

Modified: trunk/libmenu/menu_list.h
==============================================================================
--- trunk/libmenu/menu_list.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_list.h	Wed May 13 04:58:57 2009	(r29305)
@@ -83,7 +83,7 @@ extern const menu_list_priv_t menu_list_
   0xFF, 0xFF, \
   0xA4, 0x50 \
 }
-  
+
 
 #define MENU_LIST_PRIV_FIELDS \
   { "minbor", M_ST_OFF(menu_list_priv_t,minb), CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, \

Modified: trunk/libmenu/menu_param.c
==============================================================================
--- trunk/libmenu/menu_param.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_param.c	Wed May 13 04:58:57 2009	(r29305)
@@ -60,7 +60,7 @@ struct menu_priv_s {
   char* na;
   int hide_na;
 };
- 
+
 static struct menu_priv_s cfg_dflt = {
   MENU_LIST_PRIV_DFLT,
   NULL,
@@ -112,7 +112,7 @@ static int parse_args(menu_t* menu,char*
   int r;
   m_option_t* opt;
   ASX_Parser_t* parser = asx_parser_new();
-  
+
 
   while(1) {
     r = asx_get_element(parser,&args,&element,&body,&attribs);
@@ -120,7 +120,7 @@ static int parse_args(menu_t* menu,char*
       mp_msg(MSGT_OSD_MENU,MSGL_ERR,MSGTR_LIBMENU_SyntaxErrorAtLine,parser->line);
       asx_parser_free(parser);
       return -1;
-    } else if(r == 0) {      
+    } else if(r == 0) {
       asx_parser_free(parser);
       if(!m)
         mp_msg(MSGT_OSD_MENU,MSGL_WARN,MSGTR_LIBMENU_NoEntryFoundInTheMenuDefinition);
@@ -200,7 +200,7 @@ static void read_cmd(menu_t* menu,int cm
       if(mp_property_do(e->prop,M_PROPERTY_STEP_DOWN,NULL,menu->ctx) > 0)
         update_entries(menu, 0);
       return;
-      
+
     case MENU_CMD_OK:
       // check that the property is writable
       if(mp_property_do(e->prop,M_PROPERTY_SET,NULL,menu->ctx) < 0) return;
@@ -281,7 +281,7 @@ static int openMenu(menu_t* menu, char* 
     mp_msg(MSGT_OSD_MENU,MSGL_ERR,MSGTR_LIBMENU_PrefMenuNeedsAnArgument);
     return 0;
   }
- 
+
   menu_list_init(menu);
   return parse_args(menu,args);
 }

Modified: trunk/libmenu/menu_pt.c
==============================================================================
--- trunk/libmenu/menu_pt.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_pt.c	Wed May 13 04:58:57 2009	(r29305)
@@ -44,7 +44,7 @@ struct list_entry_s {
   struct list_entry p;
   play_tree_t* pt;
 };
-  
+
 
 struct menu_priv_s {
   menu_list_priv_t p;
@@ -132,7 +132,7 @@ static int op(menu_t* menu, char* args) 
   play_tree_t* i;
   list_entry_t* e;
   play_tree_iter_t* playtree_iter = mpctx_get_playtree_iter(menu->ctx);
-  
+
   args = NULL; // Warning kill
 
   menu->draw = menu_list_draw;
@@ -150,7 +150,7 @@ static int op(menu_t* menu, char* args) 
     e->pt = playtree_iter->tree->parent;
     menu_list_add_entry(menu,e);
   }
-  
+
   for(i = playtree_iter->tree ; i->prev != NULL ; i = i->prev)
     /* NOP */;
   for( ; i != NULL ; i = i->next ) {

Modified: trunk/libmenu/menu_txt.c
==============================================================================
--- trunk/libmenu/menu_txt.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/menu_txt.c	Wed May 13 04:58:57 2009	(r29305)
@@ -119,14 +119,14 @@ static void draw(menu_t* menu,mp_image_t
     end = i + mpriv->disp_lines;
     if(end >= mpriv->num_lines) end = mpriv->num_lines - 1;
   }
-  
+
   for( ; i < end ; i++) {
     menu_draw_text(mpi,mpriv->lines[i],x,y);
     y += vo_font->height + mpriv->hspace;
   }
 
 }
-    
+
 #define BUF_SIZE 1024
 
 static int open_txt(menu_t* menu, char* args) {
@@ -164,7 +164,7 @@ static int open_txt(menu_t* menu, char* 
     }
     pos += r;
     buf[pos] = '\0';
-    
+
     while((l = strchr(buf,'\n')) != NULL) {
       s = l-buf;
       mpriv->lines = realloc(mpriv->lines,(mpriv->num_lines + 1)*sizeof(char*));

Modified: trunk/libmenu/vf_menu.c
==============================================================================
--- trunk/libmenu/vf_menu.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmenu/vf_menu.c	Wed May 13 04:58:57 2009	(r29305)
@@ -71,7 +71,7 @@ static int cmd_filter(mp_cmd_t* cmd, int
   switch(cmd->id) {
   case MP_CMD_MENU : {  // Convert txt cmd from the users into libmenu stuff
     char* arg = cmd->args[0].v.s;
-    
+
     if (!priv->current->show && strcmp(arg,"hide"))
       priv->current->show = 1;
     else if(strcmp(arg,"up") == 0)
@@ -132,7 +132,7 @@ static void get_image(struct vf_instance
     return;
   }
 }
-  
+
 static int key_cb(int code) {
   return menu_read_key(st_priv->current,code);
 }
@@ -214,7 +214,7 @@ static void uninit(vf_instance_t *vf) {
 }
 
 static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height,
-		  unsigned int flags, unsigned int outfmt) { 
+		  unsigned int flags, unsigned int outfmt) {
 #ifdef CONFIG_FREETYPE
   // here is the right place to get screen dimensions
   if (force_load_font) {

Modified: trunk/libmpcodecs/ad_acm.c
==============================================================================
--- trunk/libmpcodecs/ad_acm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_acm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -11,7 +11,7 @@
 #include "ad_internal.h"
 #include "osdep/timer.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"Win32/ACM decoders",
 	"acm",
@@ -46,12 +46,12 @@ static int preinit(sh_audio_t *sh_audio)
     WAVEFORMATEX *in_fmt = sh_audio->wf;
     DWORD srcsize = 0;
     acm_context_t *priv;
-    
+
     priv = malloc(sizeof(acm_context_t));
     if (!priv)
 	return 0;
     sh_audio->context = priv;
-    
+
     mp_msg(MSGT_WIN32, MSGL_V, "======= Win32 (ACM) AUDIO Codec init =======\n");
 
 //    priv->handle = NULL;
@@ -71,7 +71,7 @@ static int preinit(sh_audio_t *sh_audio)
     priv->o_wf->wBitsPerSample = 16;
 //    priv->o_wf->wBitsPerSample = inf_fmt->wBitsPerSample;
     priv->o_wf->cbSize = 0;
-    
+
     if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) )
     {
 	mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n");
@@ -94,7 +94,7 @@ static int preinit(sh_audio_t *sh_audio)
 	return 0;
     }
     mp_msg(MSGT_WIN32, MSGL_V, "Audio codec opened OK! ;-)\n");
-    
+
     acmStreamSize(priv->handle, in_fmt->nBlockAlign, &srcsize, ACM_STREAMSIZEF_SOURCE);
     //if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize);
     srcsize *= 2;
@@ -122,7 +122,7 @@ static int preinit(sh_audio_t *sh_audio)
     mp_msg(MSGT_WIN32,MSGL_V,"Audio ACM input buffer min. size: %ld\n",srcsize);
 
     sh_audio->audio_in_minsize=2*srcsize; // audio input min. size
-    
+
     sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
     sh_audio->channels=priv->o_wf->nChannels;
     sh_audio->samplerate=priv->o_wf->nSamplesPerSec;
@@ -136,10 +136,10 @@ static void uninit(sh_audio_t *sh)
 {
     HRESULT ret;
     acm_context_t *priv = sh->context;
-    
+
 retry:
     ret = acmStreamClose(priv->handle, 0);
-    
+
     if (ret)
     switch(ret)
     {
@@ -155,7 +155,7 @@ retry:
 	    mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occurred: %ld\n", ret);
 	    return;
     }
-    
+
     MSACM_UnregisterAllDrivers();
 
     free(priv->o_wf);
@@ -207,7 +207,7 @@ static int decode_audio(sh_audio_t *sh_a
     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: trunk/libmpcodecs/ad_alaw.c
==============================================================================
--- trunk/libmpcodecs/ad_alaw.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_alaw.c	Wed May 13 04:58:57 2009	(r29305)
@@ -5,7 +5,7 @@
 #include "config.h"
 #include "ad_internal.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"aLaw/uLaw audio decoder",
 	"alaw",

Modified: trunk/libmpcodecs/ad_dk3adpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_dk3adpcm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_dk3adpcm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -2,7 +2,7 @@
     DK3 ADPCM Decoder for MPlayer
       by Mike Melanson
 
-    "This format number was used by Duck Corp. but not officially 
+    "This format number was used by Duck Corp. but not officially
     registered with Microsoft"
 
     This file is responsible for decoding audio data encoded with
@@ -19,7 +19,7 @@
 #include "mpbswap.h"
 #include "ad_internal.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"Duck Corp. DK3 ADPCM decoder",
 	"dk3adpcm",
@@ -71,7 +71,7 @@ static int adpcm_index[16] =
 static int preinit(sh_audio_t *sh_audio)
 {
   sh_audio->audio_out_minsize = sh_audio->wf->nBlockAlign * 6;
-  sh_audio->ds->ss_div = 
+  sh_audio->ds->ss_div =
     (sh_audio->wf->nBlockAlign - DK3_ADPCM_PREAMBLE_SIZE) * 8 / 3;
   sh_audio->audio_in_minsize=
   sh_audio->ds->ss_mul = sh_audio->wf->nBlockAlign;
@@ -233,8 +233,8 @@ static int dk3_adpcm_decode_block(unsign
 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
 {
   if (demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,
-    sh_audio->ds->ss_mul) != 
-    sh_audio->ds->ss_mul) 
+    sh_audio->ds->ss_mul) !=
+    sh_audio->ds->ss_mul)
       return -1; /* EOF */
 
   if (maxlen < 2 * 4 * sh_audio->wf->nBlockAlign * 2 / 3) {

Modified: trunk/libmpcodecs/ad_dmo.c
==============================================================================
--- trunk/libmpcodecs/ad_dmo.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_dmo.c	Wed May 13 04:58:57 2009	(r29305)
@@ -9,7 +9,7 @@
 #include "ad_internal.h"
 #include "libaf/reorder_ch.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"Win32/DMO decoders",
 	"dmo",

Modified: trunk/libmpcodecs/ad_dshow.c
==============================================================================
--- trunk/libmpcodecs/ad_dshow.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_dshow.c	Wed May 13 04:58:57 2009	(r29305)
@@ -8,7 +8,7 @@
 
 #include "ad_internal.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"Win32/DirectShow decoders",
 	"dshow",

Modified: trunk/libmpcodecs/ad_dvdpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_dvdpcm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_dvdpcm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -7,7 +7,7 @@
 #include "help_mp.h"
 #include "ad_internal.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"Uncompressed DVD/VOB LPCM audio decoder",
 	"dvdpcm",
@@ -40,7 +40,7 @@ static int init(sh_audio_t *sh)
 	  case 1:
 	    mp_msg(MSGT_DECAUDIO, MSGL_INFO, MSGTR_SamplesWanted);
 	    sh->i_bps = sh->channels * sh->samplerate * 5 / 2;
-	  case 2: 
+	  case 2:
 	    sh->sample_format = AF_FORMAT_S24_BE;
 	    sh->samplesize = 3;
 	    break;
@@ -139,7 +139,7 @@ static int decode_audio(sh_audio_t *sh_a
       }
       len = j;
     }
-  } else 
+  } else
   len=demux_read_data(sh_audio->ds,buf,(minlen+3)&(~3));
   return len;
 }

Modified: trunk/libmpcodecs/ad_faad.c
==============================================================================
--- trunk/libmpcodecs/ad_faad.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_faad.c	Wed May 13 04:58:57 2009	(r29305)
@@ -28,7 +28,7 @@
 #include "ad_internal.h"
 #include "libaf/reorder_ch.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"AAC (MPEG2/4 Advanced Audio Coding)",
 	"faad",
@@ -48,9 +48,9 @@ LIBAD_EXTERN(faad)
 /* configure maximum supported channels, *
  * this is theoretically max. 64 chans   */
 #define FAAD_MAX_CHANNELS 6
-#define FAAD_BUFFLEN (FAAD_MIN_STREAMSIZE*FAAD_MAX_CHANNELS)		       
+#define FAAD_BUFFLEN (FAAD_MIN_STREAMSIZE*FAAD_MAX_CHANNELS)
 
-//#define AAC_DUMP_COMPRESSED  
+//#define AAC_DUMP_COMPRESSED
 
 static faacDecHandle faac_hdec;
 static faacDecFrameInfo faac_finfo;
@@ -80,7 +80,7 @@ static int aac_probe(unsigned char *buff
   mp_msg(MSGT_DECAUDIO,MSGL_V, "\nAAC_PROBE: ret %d\n", pos);
   return pos;
 }
-	
+
 static int init(sh_audio_t *sh)
 {
   unsigned long faac_samplerate;
@@ -151,7 +151,7 @@ static int init(sh_audio_t *sh)
         faac_conf->downMatrix = 1;
         faacDecSetConfiguration(faac_hdec, faac_conf);
     }
-    
+
     /*int i;
     for(i = 0; i < sh_audio->codecdata_len; i++)
       printf("codecdata_dump %d: 0x%02X\n", i, sh_audio->codecdata[i]);*/
@@ -175,9 +175,9 @@ static int init(sh_audio_t *sh)
     if(!sh->i_bps) {
       mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: compressed input bitrate missing, assuming 128kbit/s!\n");
       sh->i_bps = 128*1000/8; // XXX: HACK!!! ::atmos
-    } else 
+    } else
       mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: got %dkbit/s bitrate from MP4 header!\n",sh->i_bps*8/1000);
-  }  
+  }
   return 1;
 }
 
@@ -213,7 +213,7 @@ static int control(sh_audio_t *sh,int cm
       case ADCTRL_RESYNC_STREAM:
          aac_sync(sh);
 	 return CONTROL_TRUE;
-#if 0      
+#if 0
       case ADCTRL_SKIP_FRAME:
 	  return CONTROL_TRUE;
 #endif
@@ -237,7 +237,7 @@ static int decode_audio(sh_audio_t *sh,u
 	demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len],
 	sh->a_in_buffer_size - sh->a_in_buffer_len);
     }
-	  
+
 #ifdef DUMP_AAC_COMPRESSED
     {int i;
     for (i = 0; i < 16; i++)
@@ -249,7 +249,7 @@ static int decode_audio(sh_audio_t *sh,u
    // raw aac stream:
    do {
     faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, sh->a_in_buffer, sh->a_in_buffer_len);
-	
+
     /* update buffer index after faacDecDecode */
     if(faac_finfo.bytesconsumed >= sh->a_in_buffer_len) {
       sh->a_in_buffer_len=0;
@@ -271,7 +271,7 @@ static int decode_audio(sh_audio_t *sh,u
       errors++;
     } else
       break;
-   } while(errors < MAX_FAAD_ERRORS);	  
+   } while(errors < MAX_FAAD_ERRORS);
   } else {
    // packetized (.mp4) aac stream:
     unsigned char* bufptr=NULL;
@@ -285,7 +285,7 @@ static int decode_audio(sh_audio_t *sh,u
     faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, bufptr, buflen);
   }
   //for (j=0;j<faac_finfo.channels;j++) printf("%d:%d\n", j, faac_finfo.channel_position[j]);
-  
+
     if(faac_finfo.error > 0) {
       mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: Failed to decode frame: %s \n",
       faacDecGetErrorMessage(faac_finfo.error));

Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_ffmpeg.c	Wed May 13 04:58:57 2009	(r29305)
@@ -11,7 +11,7 @@
 
 #include "mpbswap.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"FFmpeg/libavcodec audio decoders",
 	"ffmpeg",
@@ -46,13 +46,13 @@ static int init(sh_audio_t *sh_audio)
       avcodec_register_all();
       avcodec_initialized=1;
     }
-    
+
     lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_audio->codec->dll);
     if(!lavc_codec){
 	mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh_audio->codec->dll);
 	return 0;
     }
-    
+
     lavc_context = avcodec_alloc_context();
     sh_audio->context=lavc_context;
 
@@ -73,7 +73,7 @@ static int init(sh_audio_t *sh_audio)
     if (sh_audio->wf && sh_audio->wf->cbSize > 0) {
         lavc_context->extradata = av_mallocz(sh_audio->wf->cbSize + FF_INPUT_BUFFER_PADDING_SIZE);
         lavc_context->extradata_size = sh_audio->wf->cbSize;
-        memcpy(lavc_context->extradata, (char *)sh_audio->wf + sizeof(WAVEFORMATEX), 
+        memcpy(lavc_context->extradata, (char *)sh_audio->wf + sizeof(WAVEFORMATEX),
                lavc_context->extradata_size);
     }
 
@@ -82,8 +82,8 @@ static int init(sh_audio_t *sh_audio)
     {
         lavc_context->extradata = av_malloc(sh_audio->codecdata_len);
         lavc_context->extradata_size = sh_audio->codecdata_len;
-        memcpy(lavc_context->extradata, (char *)sh_audio->codecdata, 
-               lavc_context->extradata_size);	
+        memcpy(lavc_context->extradata, (char *)sh_audio->codecdata,
+               lavc_context->extradata_size);
     }
 
     /* open it */
@@ -92,7 +92,7 @@ static int init(sh_audio_t *sh_audio)
         return 0;
     }
    mp_msg(MSGT_DECAUDIO,MSGL_V,"INFO: libavcodec init OK!\n");
-   
+
 //   printf("\nFOURCC: 0x%X\n",sh_audio->format);
    if(sh_audio->format==0x3343414D){
        // MACE 3:1
@@ -176,7 +176,7 @@ static int decode_audio(sh_audio_t *sh_a
             int src_ch_layout = AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT;
             const char *codec=((AVCodecContext*)sh_audio->context)->codec->name;
             if (!strcasecmp(codec, "ac3")
-                || !strcasecmp(codec, "eac3"))            
+                || !strcasecmp(codec, "eac3"))
               src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT;
             else if (!strcasecmp(codec, "dca"))
               src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_DCA_DEFAULT;

Modified: trunk/libmpcodecs/ad_hwac3.c
==============================================================================
--- trunk/libmpcodecs/ad_hwac3.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_hwac3.c	Wed May 13 04:58:57 2009	(r29305)
@@ -27,7 +27,7 @@
 
 static int isdts = -1;
 
-static ad_info_t info = 
+static ad_info_t info =
 {
   "AC3/DTS pass-through S/PDIF",
   "hwac3",
@@ -80,7 +80,7 @@ static int ac3dts_fillbuff(sh_audio_t *s
     else
     {
       length = a52_syncinfo(sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate);
-      if(length >= 7 && length <= 3840) 
+      if(length >= 7 && length <= 3840)
       {
         if(isdts != 0)
         {
@@ -100,13 +100,13 @@ static int ac3dts_fillbuff(sh_audio_t *s
   sh_audio->i_bps = bit_rate / 8;
   demux_read_data(sh_audio->ds, sh_audio->a_in_buffer + 12, length - 12);
   sh_audio->a_in_buffer_len = length;
-    
+
   // TODO: is DTS also checksummed?
 #ifdef CONFIG_LIBA52_INTERNAL
   if(isdts == 0 && crc16_block(sh_audio->a_in_buffer + 2, length - 2) != 0)
     mp_msg(MSGT_DECAUDIO, MSGL_STATUS, "a52: CRC check failed!  \n");
 #endif
-    
+
   return length;
 }
 
@@ -162,7 +162,7 @@ static int control(sh_audio_t *sh,int cm
 static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen)
 {
   int len = sh_audio->a_in_buffer_len;
-  
+
   if(len <= 0)
     if((len = ac3dts_fillbuff(sh_audio)) <= 0)
       return len; /*EOF*/
@@ -305,7 +305,7 @@ static int dts_decode_header(uint8_t *in
        Frame type ( 1: Normal frame; 0: Termination frame ) */
     ftype = indata_ptr[4+le_mode] >> 7;
 
-  if(ftype != 1) 
+  if(ftype != 1)
   {
     mp_msg(MSGT_DECAUDIO, MSGL_ERR, "DTS: Termination frames not handled, REPORT BUG\n");
     return -1;
@@ -384,29 +384,29 @@ static int dts_decode_header(uint8_t *in
     *rate = (indata_ptr[10+le_mode] & 0x3f) >> 1;
   }
 #if 0
-  if(*sfreq != 13) 
+  if(*sfreq != 13)
   {
     mp_msg(MSGT_DECAUDIO, MSGL_ERR, "DTS: Only 48kHz supported, REPORT BUG\n");
     return -1;
   }
 #endif
-  if((fsize > 8192) || (fsize < 96)) 
+  if((fsize > 8192) || (fsize < 96))
   {
     mp_msg(MSGT_DECAUDIO, MSGL_ERR, "DTS: fsize: %d invalid, REPORT BUG\n", fsize);
     return -1;
   }
-    
+
   if(*nblks != 8 &&
     *nblks != 16 &&
     *nblks != 32 &&
     *nblks != 64 &&
     *nblks != 128 &&
-    ftype == 1) 
+    ftype == 1)
   {
     mp_msg(MSGT_DECAUDIO, MSGL_ERR, "DTS: nblks %d not valid for normal frame, REPORT BUG\n", *nblks);
     return -1;
   }
-  
+
   return fsize;
 }
 
@@ -416,7 +416,7 @@ static int dts_syncinfo(uint8_t *indata_
   int fsize;
   int rate;
   int sfreq;
-  
+
   fsize = dts_decode_header(indata_ptr, &rate, &nblks, &sfreq);
   if(fsize >= 0)
   {
@@ -479,7 +479,7 @@ static int decode_audio_dts(unsigned cha
 
   buf16[0] = 0xf872; /* iec 61937     */
   buf16[1] = 0x4e1f; /*  syncword     */
-  switch(nr_samples) 
+  switch(nr_samples)
   {
   case 512:
     buf16[2] = 0x000b;      /* DTS-1 (512-sample bursts) */
@@ -495,7 +495,7 @@ static int decode_audio_dts(unsigned cha
     buf16[2] = 0x0000;
     break;
   }
- 
+
   if(fsize + 8 > nr_samples * 2 * 2)
   {
     // dts wav (14bits LE) match this condition, one way to passthrough

Modified: trunk/libmpcodecs/ad_hwmpa.c
==============================================================================
--- trunk/libmpcodecs/ad_hwmpa.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_hwmpa.c	Wed May 13 04:58:57 2009	(r29305)
@@ -15,7 +15,7 @@
 
 //based on ad_hwac3.c and ad_libmad.c
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"MPEG audio pass-through (fake decoder)",
 	"hwmpa",
@@ -74,7 +74,7 @@ static int init(sh_audio_t *sh)
 	sh->samplerate = srate;
 	sh->i_bps = br * 125;
 	sh->samplesize = 2;
-	
+
 	mp_msg(MSGT_DECAUDIO,MSGL_V,"AC_HWMPA initialized, bitrate: %d kb/s\r\n", len);
 	return 1;
 }

Modified: trunk/libmpcodecs/ad_imaadpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_imaadpcm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_imaadpcm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -62,7 +62,7 @@ static const int8_t adpcm_index[8] =
 // clamp a number above 16
 #define CLAMP_ABOVE_16(x)  if (x < 16) x = 16;
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"IMA ADPCM audio decoder",
 	"imaadpcm",
@@ -84,7 +84,7 @@ static int preinit(sh_audio_t *sh_audio)
   if ((sh_audio->format == 0x11) || (sh_audio->format == 0x61) ||
       (sh_audio->format == 0x1100736d))
   {
-    sh_audio->ds->ss_div = (sh_audio->wf->nBlockAlign - 
+    sh_audio->ds->ss_div = (sh_audio->wf->nBlockAlign -
       (MS_IMA_ADPCM_PREAMBLE_SIZE * sh_audio->wf->nChannels)) * 2;
     sh_audio->ds->ss_mul = sh_audio->wf->nBlockAlign;
   }
@@ -103,7 +103,7 @@ static int init(sh_audio_t *sh_audio)
   sh_audio->channels=sh_audio->wf->nChannels;
   sh_audio->samplerate=sh_audio->wf->nSamplesPerSec;
   /* decodes 34 byte -> 64 short*/
-  sh_audio->i_bps = 
+  sh_audio->i_bps =
     (sh_audio->ds->ss_mul * sh_audio->samplerate) / sh_audio->ds->ss_div;
   sh_audio->samplesize=2;
 
@@ -263,7 +263,7 @@ static int ms_ima_adpcm_decode_block(uns
       }
     }
   }
-  
+
   decode_nibbles(output,
     (block_size - MS_IMA_ADPCM_PREAMBLE_SIZE * channels) * 2,
     channels,
@@ -310,8 +310,8 @@ static int decode_audio(sh_audio_t *sh_a
   int res = -1;
   int (*decode_func)(unsigned short *output, unsigned char *input, int channels, int block_size) = qt_ima_adpcm_decode_block;
   if (demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,
-    sh_audio->ds->ss_mul) != 
-    sh_audio->ds->ss_mul) 
+    sh_audio->ds->ss_mul) !=
+    sh_audio->ds->ss_mul)
     return -1;
 
   if ((sh_audio->format == 0x11) || (sh_audio->format == 0x1100736d))

Modified: trunk/libmpcodecs/ad_liba52.c
==============================================================================
--- trunk/libmpcodecs/ad_liba52.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_liba52.c	Wed May 13 04:58:57 2009	(r29305)
@@ -45,7 +45,7 @@ static sample_t a52_level = 1;
 float a52_drc_level = 1.0;
 static int a52_drc_action = DRC_NO_ACTION;
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"AC3 decoding with liba52",
 	"liba52",
@@ -85,12 +85,12 @@ while(1){
     demux_read_data(sh_audio->ds,sh_audio->a_in_buffer+8,length-8);
     if(sh_audio->format!=0x2000)
 	swab(sh_audio->a_in_buffer+8,sh_audio->a_in_buffer+8,length-8);
-    
+
 #ifdef CONFIG_LIBA52_INTERNAL
     if(crc16_block(sh_audio->a_in_buffer+2,length-2)!=0)
 	mp_msg(MSGT_DECAUDIO,MSGL_STATUS,"a52: CRC check failed!  \n");
 #endif
-    
+
     return length;
 }
 
@@ -312,7 +312,7 @@ static int decode_audio(sh_audio_t *sh_a
     int i,len=-1;
 	if (sh_audio->sample_format == AF_FORMAT_FLOAT_NE)
 	    bias = 0;
-	if(!sh_audio->a_in_buffer_len) 
+	if(!sh_audio->a_in_buffer_len)
 	    if(a52_fillbuff(sh_audio)<0) return len; /* EOF */
 	sh_audio->a_in_buffer_len=0;
 	if (a52_frame (a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){

Modified: trunk/libmpcodecs/ad_libdv.c
==============================================================================
--- trunk/libmpcodecs/ad_libdv.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_libdv.c	Wed May 13 04:58:57 2009	(r29305)
@@ -48,7 +48,7 @@ static int init(sh_audio_t *sh)
   WAVEFORMATEX *h=sh->wf;
 
   if(!h) return 0;
-   
+
   sh->i_bps=h->nAvgBytesPerSec;
   sh->channels=h->nChannels;
   sh->samplerate=h->nSamplesPerSec;
@@ -84,7 +84,7 @@ static int decode_audio(sh_audio_t *audi
    if(xx<=0 || !dv_audio_frame) return 0; // EOF?
 
    dv_parse_header(decoder, dv_audio_frame);
-   
+
    if(xx!=decoder->frame_size)
        mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_MPCODECS_AudioFramesizeDiffers,
            xx, decoder->frame_size);
@@ -94,7 +94,7 @@ static int decode_audio(sh_audio_t *audi
       /* Interleave the audio into a single buffer */
       int i=0;
       int16_t *bufP=(int16_t*)buf;
-      
+
 //      printf("samples=%d/%d  chans=%d  mem=%d  \n",decoder->audio->samples_this_frame,DV_AUDIO_MAX_SAMPLES,
 //          decoder->audio->num_channels, decoder->audio->samples_this_frame*decoder->audio->num_channels*2);
 

Modified: trunk/libmpcodecs/ad_libmad.c
==============================================================================
--- trunk/libmpcodecs/ad_libmad.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_libmad.c	Wed May 13 04:58:57 2009	(r29305)
@@ -22,10 +22,10 @@ LIBAD_EXTERN(libmad)
 
 typedef struct mad_decoder_s {
 
-  struct mad_synth  synth; 
+  struct mad_synth  synth;
   struct mad_stream stream;
   struct mad_frame  frame;
-  
+
   int have_frame;
 
   int               output_sampling_rate;
@@ -39,14 +39,14 @@ static int preinit(sh_audio_t *sh){
   mad_decoder_t *this = (mad_decoder_t *) malloc(sizeof(mad_decoder_t));
   memset(this,0,sizeof(mad_decoder_t));
   sh->context = this;
-  
+
   mad_synth_init  (&this->synth);
   mad_stream_init (&this->stream);
   mad_frame_init  (&this->frame);
-  
+
   sh->audio_out_minsize=2*4608;
   sh->audio_in_minsize=4096;
-  
+
   return 1;
 }
 
@@ -82,12 +82,12 @@ static int init(sh_audio_t *sh){
 
   this->have_frame=read_frame(sh);
   if(!this->have_frame) return 0; // failed to sync...
-  
+
   sh->channels=(this->frame.header.mode == MAD_MODE_SINGLE_CHANNEL) ? 1 : 2;
   sh->samplerate=this->frame.header.samplerate;
   sh->i_bps=this->frame.header.bitrate/8;
   sh->samplesize=2;
-  
+
   return 1;
 }
 
@@ -137,19 +137,19 @@ static int decode_audio(sh_audio_t *sh,u
 
 	  len+=2*nchannels*nsamples;
 	  buf+=2*nchannels*nsamples;
-	  
+
 	  while (nsamples--) {
 	    /* output sample(s) in 16-bit signed little-endian PCM */
-	    
+
 	    *output++ = scale(*left_ch++);
-	    
-	    if (nchannels == 2) 
+
+	    if (nchannels == 2)
 	      *output++ = scale(*right_ch++);
 
 	  }
 	}
   }
-  
+
   return len?len:-1;
 }
 

Modified: trunk/libmpcodecs/ad_libvorbis.c
==============================================================================
--- trunk/libmpcodecs/ad_libvorbis.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_libvorbis.c	Wed May 13 04:58:57 2009	(r29305)
@@ -9,7 +9,7 @@
 #include "ad_internal.h"
 #include "libaf/reorder_ch.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"Ogg/Vorbis audio decoder",
 #ifdef CONFIG_TREMOR
@@ -162,7 +162,7 @@ static int init(sh_audio_t *sh)
     if(ov->rg_scale * rg_peak > 1.f)
       ov->rg_scale = 1.f / rg_peak;
     /* replaygain: security */
-    if(ov->rg_scale > 15.) 
+    if(ov->rg_scale > 15.)
       ov->rg_scale = 15.;
 #ifdef CONFIG_TREMOR
     ov->rg_scale_int = (int)(ov->rg_scale*64.f);
@@ -180,7 +180,7 @@ static int init(sh_audio_t *sh)
 //  printf("lower=%d  upper=%d  \n",(int)ov->vi.bitrate_lower,(int)ov->vi.bitrate_upper);
 
   // Setup the decoder
-  sh->channels=ov->vi.channels; 
+  sh->channels=ov->vi.channels;
   sh->samplerate=ov->vi.rate;
   sh->samplesize=2;
   // assume 128kbit if bitrate not specified in the header
@@ -208,7 +208,7 @@ static int control(sh_audio_t *sh,int cm
 {
     switch(cmd)
     {
-#if 0      
+#if 0
       case ADCTRL_RESYNC_STREAM:
 	  return CONTROL_TRUE;
       case ADCTRL_SKIP_FRAME:
@@ -249,7 +249,7 @@ static int decode_audio(sh_audio_t *sh,u
 	    int clipflag=0;
 	    int convsize=(maxlen-len)/(2*ov->vi.channels); // max size!
 	    int bout=((samples<convsize)?samples:convsize);
-	  
+
 	    if(bout<=0) break; // no buffer space
 
 	    /* convert floats to 16 bit signed ints (host order) and
@@ -307,7 +307,7 @@ static int decode_audio(sh_audio_t *sh,u
 	      }
 	    }
 	   }
-		
+
 	    if(clipflag)
 	      mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"Clipping in frame %ld\n",(long)(ov->vd.sequence));
 	    len+=2*ov->vi.channels*bout;

Modified: trunk/libmpcodecs/ad_mp3lib.c
==============================================================================
--- trunk/libmpcodecs/ad_mp3lib.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_mp3lib.c	Wed May 13 04:58:57 2009	(r29305)
@@ -6,7 +6,7 @@
 
 #include "ad_internal.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"MPEG layer-2, layer-3",
 	"mp3lib",

Modified: trunk/libmpcodecs/ad_mpc.c
==============================================================================
--- trunk/libmpcodecs/ad_mpc.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_mpc.c	Wed May 13 04:58:57 2009	(r29305)
@@ -16,7 +16,7 @@
 #include "libaf/af_format.h"
 #include "libvo/fastmemcpy.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"Musepack audio decoder",
 	"mpcdec",
@@ -158,7 +158,7 @@ static int decode_audio(sh_audio_t *sh, 
   int status, len;
   MPC_SAMPLE_FORMAT *sample_buffer = (MPC_SAMPLE_FORMAT *)buf;
   mpc_uint32_t *packet = NULL;
-  
+
   context_t *cd = (context_t *) sh->context;
   if (maxlen < MAX_FRAMESIZE) {
     mp_msg(MSGT_DECAUDIO, MSGL_V, "maxlen too small in decode_audio\n");

Modified: trunk/libmpcodecs/ad_msadpcm.c
==============================================================================
--- trunk/libmpcodecs/ad_msadpcm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_msadpcm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -17,7 +17,7 @@
 #include "mpbswap.h"
 #include "ad_internal.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"MS ADPCM audio decoder",
 	"msadpcm",
@@ -60,7 +60,7 @@ static const int8_t ms_adapt_coeff2[] =
 static int preinit(sh_audio_t *sh_audio)
 {
   sh_audio->audio_out_minsize = sh_audio->wf->nBlockAlign * 4;
-  sh_audio->ds->ss_div = 
+  sh_audio->ds->ss_div =
     (sh_audio->wf->nBlockAlign - MS_ADPCM_PREAMBLE_SIZE) * 2;
   sh_audio->audio_in_minsize =
   sh_audio->ds->ss_mul = sh_audio->wf->nBlockAlign;
@@ -208,8 +208,8 @@ static int decode_audio(sh_audio_t *sh_a
 {
   int res;
   if (demux_read_data(sh_audio->ds, sh_audio->a_in_buffer,
-    sh_audio->ds->ss_mul) != 
-    sh_audio->ds->ss_mul) 
+    sh_audio->ds->ss_mul) !=
+    sh_audio->ds->ss_mul)
       return -1; /* EOF */
 
   res = ms_adpcm_decode_block(

Modified: trunk/libmpcodecs/ad_msgsm.c
==============================================================================
--- trunk/libmpcodecs/ad_msgsm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_msgsm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -5,7 +5,7 @@
 #include "config.h"
 #include "ad_internal.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"native GSM/MSGSM audio decoder",
 	"msgsm",

Modified: trunk/libmpcodecs/ad_pcm.c
==============================================================================
--- trunk/libmpcodecs/ad_pcm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_pcm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -7,7 +7,7 @@
 #include "libaf/af_format.h"
 #include "libaf/reorder_ch.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
 	"Uncompressed PCM audio decoder",
 	"pcm",

Modified: trunk/libmpcodecs/ad_qtaudio.c
==============================================================================
--- trunk/libmpcodecs/ad_qtaudio.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_qtaudio.c	Wed May 13 04:58:57 2009	(r29305)
@@ -45,14 +45,14 @@ typedef int (__cdecl* LPFUNC1)(long flag
 typedef int (__cdecl* LPFUNC2)(const SoundComponentData *, const SoundComponentData *,SoundConverter *);
 typedef int (__cdecl* LPFUNC3)(SoundConverter sc);
 typedef int (__cdecl* LPFUNC4)(void);
-typedef int (__cdecl* LPFUNC5)(SoundConverter sc, OSType selector,void * infoPtr);                          
-typedef int (__cdecl* LPFUNC6)(SoundConverter sc, 
+typedef int (__cdecl* LPFUNC5)(SoundConverter sc, OSType selector,void * infoPtr);
+typedef int (__cdecl* LPFUNC6)(SoundConverter sc,
 								unsigned long inputBytesTarget,
 								unsigned long *inputFrames,
 								unsigned long *inputBytes,
 								unsigned long *outputBytes );
-typedef int (__cdecl* LPFUNC7)(SoundConverter sc, 
-								const void    *inputPtr, 
+typedef int (__cdecl* LPFUNC7)(SoundConverter sc,
+								const void    *inputPtr,
 								unsigned long inputFrames,
 								void          *outputPtr,
 								unsigned long *outputFrames,
@@ -61,7 +61,7 @@ typedef int (__cdecl* LPFUNC8)(SoundConv
 								void      *outputPtr,
                                 unsigned long *outputFrames,
                                 unsigned long *outputBytes);
-typedef int (__cdecl* LPFUNC9)(SoundConverter         sc) ;                                
+typedef int (__cdecl* LPFUNC9)(SoundConverter         sc) ;
 
 static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
 static HINSTANCE qtml_dll;
@@ -179,7 +179,7 @@ static int preinit(sh_audio_t *sh){
     EnterMovies();
 #else
     if(loader_init()) return 0; // failed to load DLL
-    
+
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE!\n");
 
     error = InitializeQTML(6+16);
@@ -188,7 +188,7 @@ static int preinit(sh_audio_t *sh){
         return 0;
     }
 #endif
-    
+
 #if 1
 	OutputFormatInfo.flags = InputFormatInfo.flags = 0;
 	OutputFormatInfo.sampleCount = InputFormatInfo.sampleCount = 0;
@@ -219,7 +219,7 @@ static int preinit(sh_audio_t *sh){
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"InputBufferSize  = %li\n",InputBufferSize);
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"OutputBufferSize = %li\n",OutputBufferSize);
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FramesToGet = %li\n",FramesToGet);
-    
+
     InFrameSize=(InputBufferSize+FramesToGet-1)/FramesToGet;
     OutFrameSize=OutputBufferSize/FramesToGet;
 
@@ -231,7 +231,7 @@ static int preinit(sh_audio_t *sh){
 
     sh->audio_out_minsize=OutputBufferSize;
     sh->audio_in_minsize=InputBufferSize;
-  
+
     sh->channels=sh->wf->nChannels;
     sh->samplerate=sh->wf->nSamplesPerSec;
     sh->samplesize=2; //(sh->wf->wBitsPerSample+7)/8;
@@ -286,7 +286,7 @@ static int decode_audio(sh_audio_t *sh,u
     unsigned long InputBufferSize=0; //size of the input buffer
     unsigned long ConvertedFrames=0;
     unsigned long ConvertedBytes=0;
-    
+
     FramesToGet=minlen/OutFrameSize;
     if(FramesToGet*OutFrameSize<minlen &&
        (FramesToGet+1)*OutFrameSize<=maxlen) ++FramesToGet;
@@ -305,7 +305,7 @@ static int decode_audio(sh_audio_t *sh,u
 	if(InputBufferSize>sh->a_in_buffer_len)
 	    FramesToGet=sh->a_in_buffer_len/InFrameSize; // not enough data!
     }
-    
+
 //    printf("\nSoundConverterConvertBuffer(myConv=%p,inbuf=%p,frames=%d,outbuf=%p,&convframes=%p,&convbytes=%p)\n",
 //	myConverter,sh->a_in_buffer,FramesToGet,buf,&ConvertedFrames,&ConvertedBytes);
     error = SoundConverterConvertBuffer(myConverter,sh->a_in_buffer,
@@ -313,7 +313,7 @@ static int decode_audio(sh_audio_t *sh,u
 //    printf("SoundConverterConvertBuffer:%i\n",error);
 //    printf("ConvertedFrames = %li\n",ConvertedFrames);
 //    printf("ConvertedBytes = %li\n",ConvertedBytes);
-    
+
 //    InputBufferSize=(ConvertedBytes/OutFrameSize)*InFrameSize; // FIXME!!
     InputBufferSize=FramesToGet*InFrameSize;
     sh->a_in_buffer_len-=InputBufferSize;

Modified: trunk/libmpcodecs/ad_realaud.c
==============================================================================
--- trunk/libmpcodecs/ad_realaud.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_realaud.c	Wed May 13 04:58:57 2009	(r29305)
@@ -80,7 +80,7 @@ typedef struct {
  Probably the linux .so-s were compiled with old GCC without setting
  packing, so it adds 2 bytes padding after the quality field.
  In windows it seems that there's no padding in it.
- 
+
  -- alex
 */
 
@@ -132,7 +132,7 @@ static int load_syms_linux(char *path)
     raSetFlavor = dlsym(handle, "RASetFlavor");
     raSetDLLAccessPath = dlsym(handle, "SetDLLAccessPath");
     raSetPwd = dlsym(handle, "RASetPwd"); // optional, used by SIPR
-    
+
     if (raCloseCodec && raDecode && raFreeDecoder &&
 	(raOpenCodec||raOpenCodec2) && raSetFlavor &&
 	/*raSetDLLAccessPath &&*/ raInitDecoder)
@@ -140,12 +140,12 @@ static int load_syms_linux(char *path)
 	rv_handle = handle;
 	return 1;
     }
-    
+
     mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Cannot resolve symbols - incompatible dll: %s\n",path);
     dlclose(handle);
     return 0;
 }
-#endif    
+#endif
 
 #ifdef CONFIG_WIN32DLL
 
@@ -159,7 +159,7 @@ int WINAPI FreeLibrary(void *handle);
 static int load_syms_windows(char *path)
 {
     void *handle;
-    
+
     mp_msg(MSGT_DECVIDEO, MSGL_V, "opening win32 dll '%s'\n", path);
 #ifdef WIN32_LOADER
     Setup_LDT_Keeper();
@@ -180,7 +180,7 @@ static int load_syms_windows(char *path)
     wraSetFlavor = GetProcAddress(handle, "RASetFlavor");
     wraSetDLLAccessPath = GetProcAddress(handle, "SetDLLAccessPath");
     wraSetPwd = GetProcAddress(handle, "RASetPwd"); // optional, used by SIPR
-    
+
     if (wraCloseCodec && wraDecode && wraFreeDecoder &&
 	(wraOpenCodec || wraOpenCodec2) && wraSetFlavor &&
 	/*wraSetDLLAccessPath &&*/ wraInitDecoder)
@@ -189,11 +189,11 @@ static int load_syms_windows(char *path)
 	dll_type = 1;
 	return 1;
     }
-    
+
     mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Cannot resolve symbols - incompatible dll: %s\n",path);
     FreeLibrary(handle);
     return 0;
-    
+
 }
 #endif
 
@@ -210,8 +210,8 @@ static int preinit(sh_audio_t *sh){
 
     /* first try to load linux dlls, if failed and we're supporting win32 dlls,
        then try to load the windows ones */
-      
-#ifdef HAVE_LIBDL       
+
+#ifdef HAVE_LIBDL
     if (strstr(sh->codec->dll,".dll") || !load_syms_linux(path))
 #endif
 #ifdef CONFIG_WIN32DLL
@@ -273,7 +273,7 @@ static int preinit(sh_audio_t *sh){
   sh->samplesize=sh->wf->wBitsPerSample/8;
   sh->channels=sh->wf->nChannels;
 
-  { 
+  {
     ra_init_t init_data={
 	sh->wf->nSamplesPerSec,
 	sh->wf->wBitsPerSample,
@@ -323,10 +323,10 @@ static int preinit(sh_audio_t *sh){
 #endif
 	raSetPwd(sh->context,"Ardubancel Quazanga"); // set password... lol.
     }
-  
+
   if (sh->format == mmioFOURCC('s','i','p','r')) {
     short flavor;
-    
+
     if (sh->wf->nAvgBytesPerSec > 1531)
         flavor = 3;
     else if (sh->wf->nAvgBytesPerSec > 937)
@@ -350,10 +350,10 @@ static int preinit(sh_audio_t *sh){
   } // sipr flavor
 
     sh->i_bps=sh->wf->nAvgBytesPerSec;
-    
+
   sh->audio_out_minsize=128000; // no idea how to get... :(
   sh->audio_in_minsize = sh->wf->nBlockAlign;
-  
+
   return 1; // return values: 1=OK 0=ERROR
 }
 
@@ -362,7 +362,7 @@ static int init(sh_audio_t *sh_audio){
 
   // you can store HANDLE or private struct pointer at sh->context
   // you can access WAVEFORMATEX header at sh->wf
-  
+
   // set sample format/rate parameters if you didn't do it in preinit() yet.
 
   return 1; // return values: 1=OK 0=ERROR
@@ -406,7 +406,7 @@ static int decode_audio(sh_audio_t *sh,u
       sh->a_in_buffer_size=
       sh->a_in_buffer_len=sh->wf->nBlockAlign;
   }
-  
+
 #ifdef CONFIG_WIN32DLL
     if (dll_type == 1)
       result=wraDecode(sh->context, sh->a_in_buffer+sh->a_in_buffer_size-sh->a_in_buffer_len, sh->wf->nBlockAlign,
@@ -416,7 +416,7 @@ static int decode_audio(sh_audio_t *sh,u
   result=raDecode(sh->context, sh->a_in_buffer+sh->a_in_buffer_size-sh->a_in_buffer_len, sh->wf->nBlockAlign,
        buf, &len, -1);
   sh->a_in_buffer_len-=sh->wf->nBlockAlign;
-  
+
 //  printf("radecode: %d bytes, res=0x%X  \n",len,result);
 
   return len; // return value: number of _bytes_ written to output buffer,

Modified: trunk/libmpcodecs/ad_sample.c
==============================================================================
--- trunk/libmpcodecs/ad_sample.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_sample.c	Wed May 13 04:58:57 2009	(r29305)
@@ -23,18 +23,18 @@ static int preinit(sh_audio_t *sh){
   // let's check if the driver is available, return 0 if not.
   // (you should do that if you use external lib(s) which is optional)
   ...
-  
+
   // there are default values set for buffering, but you can override them:
-  
+
   // minimum output buffer size (should be the uncompressed max. frame size)
   sh->audio_out_minsize=4*2*1024; // in this sample, we assume max 4 channels,
                                   // 2 bytes/sample and 1024 samples/frame
 				  // Default: 8192
-  
+
   // minimum input buffer size (set only if you need input buffering)
   // (should be the max compressed frame size)
   sh->audio_in_minsize=2048; // Default: 0 (no input buffer)
-  
+
   // if you set audio_in_minsize non-zero, the buffer will be allocated
   // before the init() call by the core, and you can access it via
   // pointer: sh->audio_in_buffer
@@ -43,17 +43,17 @@ static int preinit(sh_audio_t *sh){
   // the next few parameters define the audio format (channels, sample type,
   // in/out bitrate etc.). it's OK to move these to init() if you can set
   // them only after some initialization:
-  
+
   sh->samplesize=2;              // bytes (not bits!) per sample per channel
   sh->channels=2;                // number of channels
   sh->samplerate=44100;          // samplerate
   sh->sample_format=AF_FORMAT_S16_LE; // sample format, see libao2/afmt.h
-  
+
   sh->i_bps=64000/8; // input data rate (compressed bytes per second)
   // Note: if you have VBR or unknown input rate, set it to some common or
   // average value, instead of zero. it's used to predict time delay of
   // buffered compressed bytes, so it must be more-or-less real!
-  
+
 //sh->o_bps=...     // output data rate (uncompressed bytes per second)
   // Note: you DON'T need to set o_bps in most cases, as it defaults to:
   //   sh->samplesize*sh->channels*sh->samplerate;
@@ -62,7 +62,7 @@ static int preinit(sh_audio_t *sh){
   // set the compressed and uncompressed packet size (used by the demuxer):
   sh->ds->ss_mul = 34; // compressed packet size
   sh->ds->ss_div = 64; // samples per packet
-  
+
   return 1; // return values: 1=OK 0=ERROR
 }
 
@@ -71,7 +71,7 @@ static int init(sh_audio_t *sh_audio){
 
   // you can store HANDLE or private struct pointer at sh->context
   // you can access WAVEFORMATEX header at sh->wf
-  
+
   // set sample format/rate parameters if you didn't do it in preinit() yet.
 
   return 1; // return values: 1=OK 0=ERROR
@@ -86,7 +86,7 @@ static int decode_audio(sh_audio_t *sh_a
 
   // audio decoding. the most important thing :)
   // parameters you get:
-  //  buf = pointer to the output buffer, you have to store uncompressed 
+  //  buf = pointer to the output buffer, you have to store uncompressed
   //        samples there
   //  minlen = requested minimum size (in bytes!) of output. it's just a
   //        _recommendation_, you can decode more or less, it just tell you that
@@ -96,8 +96,8 @@ static int decode_audio(sh_audio_t *sh_a
   //        buffer, it's the upper-most limit!
   //        note: maxlen will be always greater or equal to sh->audio_out_minsize
 
-  // now, let's decode...  
-  
+  // now, let's decode...
+
   // you can read the compressed stream using the demux stream functions:
   //  demux_read_data(sh->ds, buffer, length) - read 'length' bytes to 'buffer'
   //  ds_get_packet(sh->ds, &buffer) - set ptr buffer to next data packet

Modified: trunk/libmpcodecs/ad_twin.c
==============================================================================
--- trunk/libmpcodecs/ad_twin.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ad_twin.c	Wed May 13 04:58:57 2009	(r29305)
@@ -11,7 +11,7 @@
 
 #include "help_mp.h"
 
-static ad_info_t info = 
+static ad_info_t info =
 {
     "TWinVQ decoder",
     "vqf",
@@ -204,7 +204,7 @@ static int bread(char   *data,    /* Out
     unsigned char mask, tmpdat;
     int  retval;
     vqf_priv_t *priv=sh->context;
-    
+
     /*--- Main operation ---*/
     retval = 0;
     mask = 0x1;
@@ -223,7 +223,7 @@ static int bread(char   *data,    /* Out
         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++)
@@ -249,7 +249,7 @@ static int get_bstm(int *data,          
     unsigned    work;
     char    tmpbit[BITS_INT];
     int     retval;
-    
+
     if ( nbits > BITS_INT ){
         mp_msg(MSGT_DECAUDIO, MSGL_ERR, "get_bstm(): %d: %d Error.\n",
             nbits, BITS_INT);
@@ -346,7 +346,7 @@ static int GetPpcInfo( tvqConfInfo *cf, 
     int idiv, i_sup;
     int bitcount = 0;
     vqf_priv_t*priv=sh->context;
-    
+
     for ( idiv=0; idiv<cf->N_DIV_P; idiv++ ){
         bitcount += get_bstm(&(index->pls[idiv]), priv->bits_0[BLK_PPC][idiv],sh);       /*CB0*/
         bitcount += get_bstm(&(index->pls[idiv+cf->N_DIV_P]), priv->bits_1[BLK_PPC][idiv],sh);/*CB1*/
@@ -355,7 +355,7 @@ static int GetPpcInfo( tvqConfInfo *cf, 
         bitcount += get_bstm(&(index->pit[i_sup]), cf->BASF_BIT,sh);
         bitcount += get_bstm(&(index->pgain[i_sup]), cf->PGAIN_BIT,sh);
     }
-    
+
     return bitcount;
 }
 
@@ -372,7 +372,7 @@ static int GetEbcInfo( tvqConfInfo *cf, 
             }
         }
     }
-    
+
     return bitcount;
 }
 
@@ -385,7 +385,7 @@ static int vqf_read_frame(sh_audio_t *sh
     int numFixedBitsPerFrame = TvqGetNumFixedBitsPerFrame();
     int btype;
     vqf_priv_t *priv=sh->context;
-    
+
     /*--- Initialization ---*/
     variableBits = 0;
     bitcount = 0;
@@ -403,10 +403,10 @@ static int vqf_read_frame(sh_audio_t *sh
     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 */
@@ -421,7 +421,7 @@ static int vqf_read_frame(sh_audio_t *sh
     if ( cfg->ebc_enable ){
         bitcount += GetEbcInfo( &priv->cf, cfg, index, sh );
     }
-    
+
     return bitcount == numFixedBitsPerFrame ? bitcount/8 : 0;
 }
 
@@ -434,7 +434,7 @@ static void frtobuf_s16(float out[],    
     unsigned ismp, ich;
     float *ptr;
     float dtmp;
-    
+
     for ( ich=0; ich<numChannels; ich++ ){
         ptr = out+ich*frameSize;
         for ( ismp=0; ismp<frameSize; ismp++ ){
@@ -461,7 +461,7 @@ static void frtobuf_float(float out[],  
     unsigned ismp, ich;
     float *ptr;
     float dtmp;
-    
+
     for ( ich=0; ich<numChannels; ich++ ){
         ptr = out+ich*frameSize;
         for ( ismp=0; ismp<frameSize; ismp++ ){

Modified: trunk/libmpcodecs/ae.c
==============================================================================
--- trunk/libmpcodecs/ae.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ae.c	Wed May 13 04:58:57 2009	(r29305)
@@ -40,11 +40,11 @@ audio_encoder_t *new_audio_encoder(muxer
 	audio_encoder_t *encoder;
 	if(! params)
 		return NULL;
-	
+
 	encoder = (audio_encoder_t *) calloc(1, sizeof(audio_encoder_t));
 	memcpy(&encoder->params, params, sizeof(audio_encoding_params_t));
 	encoder->stream = stream;
-	
+
 	switch(stream->codec)
 	{
 		case ACODEC_PCM:
@@ -79,7 +79,7 @@ audio_encoder_t *new_audio_encoder(muxer
 			ris = 0;
 			break;
 	}
-	
+
 	if(! ris)
 	{
 		free(encoder);
@@ -92,7 +92,7 @@ audio_encoder_t *new_audio_encoder(muxer
 		free(encoder);
 		return NULL;
 	}
-	
+
 	encoder->codec = stream->codec;
 	return encoder;
 }

Modified: trunk/libmpcodecs/ae_faac.c
==============================================================================
--- trunk/libmpcodecs/ae_faac.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ae_faac.c	Wed May 13 04:58:57 2009	(r29305)
@@ -18,7 +18,7 @@
 
 static faacEncHandle faac;
 static faacEncConfigurationPtr config = NULL;
-static int 
+static int
 	param_bitrate = 128,
 	param_quality = 0,
 	param_object_type = 1,
@@ -58,11 +58,11 @@ static int bind_faac(audio_encoder_t *en
 	mux_a->h.dwScale=encoder->params.samples_per_frame;
 	mux_a->wf->nSamplesPerSec=mux_a->h.dwRate;
 	mux_a->wf->nAvgBytesPerSec = encoder->params.bitrate / 8;
-	
+
 	mux_a->wf->nBlockAlign = mux_a->h.dwScale;
 	mux_a->h.dwSuggestedBufferSize = (encoder->params.audio_preload*mux_a->wf->nAvgBytesPerSec)/1000;
 	mux_a->h.dwSuggestedBufferSize -= mux_a->h.dwSuggestedBufferSize % mux_a->wf->nBlockAlign;
-	
+
 	mux_a->wf->cbSize = decoder_specific_len;
 	mux_a->wf->wBitsPerSample = 0; /* does not apply */
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->wID = 1;
@@ -70,23 +70,23 @@ static int bind_faac(audio_encoder_t *en
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nBlockSize = mux_a->wf->nBlockAlign;
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nFramesPerBlock = 1;
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nCodecDelay = 0;
-	
-	// Fix allocation    
+
+	// Fix allocation
 	mux_a->wf = realloc(mux_a->wf, sizeof(WAVEFORMATEX)+mux_a->wf->cbSize);
-	
+
 	if(config->inputFormat == FAAC_INPUT_FLOAT)
 		encoder->input_format = AF_FORMAT_FLOAT_NE;
 	else if(config->inputFormat == FAAC_INPUT_32BIT)
 		encoder->input_format = AF_FORMAT_S32_NE;
 	else
 		encoder->input_format = AF_FORMAT_S16_NE;
-		
+
 	encoder->min_buffer_size = mux_a->h.dwSuggestedBufferSize;
 	encoder->max_buffer_size = mux_a->h.dwSuggestedBufferSize*2;
 
 	if(decoder_specific_buffer && decoder_specific_len)
 		memcpy(mux_a->wf + 1, decoder_specific_buffer, decoder_specific_len);
-	
+
 	return 1;
 }
 
@@ -107,7 +107,7 @@ static int encode_faac(audio_encoder_t *
 
 	// len is divided by the number of bytes per sample
 	enc_frame_size = faacEncEncode(faac,  (int32_t*) src,  len / divisor, dest, max_size);
-	
+
 	return enc_frame_size;
 }
 
@@ -117,13 +117,13 @@ int close_faac(audio_encoder_t *encoder)
 }
 
 int mpae_init_faac(audio_encoder_t *encoder)
-{	
+{
 	if(encoder->params.channels < 1 || encoder->params.channels > 6 || (param_mpeg != 2 && param_mpeg != 4))
 	{
 		mp_msg(MSGT_MENCODER, MSGL_FATAL, "AE_FAAC, unsupported number of channels: %d, or mpeg version: %d, exit\n", encoder->params.channels, param_mpeg);
 		return 0;
 	}
-	
+
 	faac = faacEncOpen(encoder->params.sample_rate, encoder->params.channels, &samples_input, &max_bytes_output);
 	if(!faac)
 	{
@@ -143,7 +143,7 @@ int mpae_init_faac(audio_encoder_t *enco
 		config->quantqual = param_quality;
 	else
 		config->bitRate = param_bitrate / encoder->params.channels;
-	
+
 	if(param_format==33)
 	{
 		config->inputFormat = FAAC_INPUT_FLOAT;
@@ -172,26 +172,26 @@ int mpae_init_faac(audio_encoder_t *enco
 	config->bandWidth = param_cutoff;
 	if(encoder->params.channels == 6)
 		config->useLfe = 1;
-	
-	if(!faacEncSetConfiguration(faac, config)) 
+
+	if(!faacEncSetConfiguration(faac, config))
 	{
 		mp_msg(MSGT_MENCODER, MSGL_FATAL, "AE_FAAC, counldn't set specified parameters, exiting\n");
 		return 0;
 	}
-	
+
 	if(param_raw)
-		faacEncGetDecoderSpecificInfo(faac, &decoder_specific_buffer, &decoder_specific_len); 
+		faacEncGetDecoderSpecificInfo(faac, &decoder_specific_buffer, &decoder_specific_len);
 	else
 		decoder_specific_len = 0;
-		
+
 	encoder->params.bitrate = param_bitrate;
 	encoder->params.samples_per_frame = 1024;
 	encoder->decode_buffer_size =  divisor * samples_input;	//samples * 16 bits_per_sample
-	
+
 	encoder->bind = bind_faac;
 	encoder->get_frame_size = get_frame_size;
 	encoder->encode = encode_faac;
 	encoder->close = close_faac;
-	
+
 	return 1;
 }

Modified: trunk/libmpcodecs/ae_lame.c
==============================================================================
--- trunk/libmpcodecs/ae_lame.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ae_lame.c	Wed May 13 04:58:57 2009	(r29305)
@@ -93,11 +93,11 @@ static int bind_lame(audio_encoder_t *en
     ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nBlockSize=encoder->params.samples_per_frame; // ???
     ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nFramesPerBlock=1;
     ((MPEGLAYER3WAVEFORMAT*)(mux_a->wf))->nCodecDelay=0;
-    
+
     encoder->input_format = AF_FORMAT_S16_NE;
     encoder->min_buffer_size = 4608;
     encoder->max_buffer_size = mux_a->h.dwRate * mux_a->wf->nChannels * 2;
-    
+
     return 1;
 }
 
@@ -187,14 +187,14 @@ int mpae_init_lame(audio_encoder_t *enco
     }
 #endif
     if(lame_init_params(lame) == -1) {
-        mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_LameCantInit); 
+        mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_LameCantInit);
         return 0;
     }
     if( mp_msg_test(MSGT_MENCODER,MSGL_V) ) {
         lame_print_config(lame);
         lame_print_internals(lame);
     }
-    
+
     encoder->bind = bind_lame;
     encoder->get_frame_size = get_frame_size;
     encoder->encode = encode_lame;
@@ -204,7 +204,7 @@ int mpae_init_lame(audio_encoder_t *enco
 }
 
 #ifdef CONFIG_MP3LAME_PRESET
-/* lame_presets_set 
+/* lame_presets_set
    taken out of presets_set in lame-3.93.1/frontend/parse.c and modified */
 static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name )
 {
@@ -264,7 +264,7 @@ static int  lame_presets_set( lame_t gfp
         return 0;
     }
 #endif
-    
+
     if (strcmp(preset_name, "standard") == 0) {
         if (fast > 0)
            lame_set_preset(gfp, STANDARD_FAST);
@@ -273,7 +273,7 @@ static int  lame_presets_set( lame_t gfp
 
         return 0;
     }
-    
+
     else if (strcmp(preset_name, "extreme") == 0){
         if (fast > 0)
            lame_set_preset(gfp, EXTREME_FAST);
@@ -282,12 +282,12 @@ static int  lame_presets_set( lame_t gfp
 
         return 0;
     }
-    					
-    else if (((strcmp(preset_name, "insane") == 0) || 
+
+    else if (((strcmp(preset_name, "insane") == 0) ||
               (strcmp(preset_name, "320"   ) == 0))   && (fast < 1)) {
 
         lame_set_preset(gfp, INSANE);
- 
+
         return 0;
     }
 

Modified: trunk/libmpcodecs/ae_lavc.c
==============================================================================
--- trunk/libmpcodecs/ae_lavc.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ae_lavc.c	Wed May 13 04:58:57 2009	(r29305)
@@ -42,18 +42,18 @@ static int bind_lavc(audio_encoder_t *en
 	mux_a->h.dwRate = mux_a->wf->nAvgBytesPerSec;
 	if(lavc_actx->block_align)
 		mux_a->h.dwSampleSize = mux_a->h.dwScale = lavc_actx->block_align;
-	else 
+	else
 	{
 		mux_a->h.dwScale = (mux_a->wf->nAvgBytesPerSec * lavc_actx->frame_size)/ mux_a->wf->nSamplesPerSec; /* for cbr */
-	
+
 		if ((mux_a->wf->nAvgBytesPerSec *
-			lavc_actx->frame_size) % mux_a->wf->nSamplesPerSec) 
+			lavc_actx->frame_size) % mux_a->wf->nSamplesPerSec)
 		{
 			mux_a->h.dwScale = lavc_actx->frame_size;
 			mux_a->h.dwRate = lavc_actx->sample_rate;
 			mux_a->h.dwSampleSize = 0; // Blocksize not constant
-		} 
-		else 
+		}
+		else
 			mux_a->h.dwSampleSize = 0;
 	}
         if(mux_a->h.dwSampleSize)
@@ -63,7 +63,7 @@ static int bind_lavc(audio_encoder_t *en
 	mux_a->h.dwSuggestedBufferSize = (encoder->params.audio_preload*mux_a->wf->nAvgBytesPerSec)/1000;
 	mux_a->h.dwSuggestedBufferSize -= mux_a->h.dwSuggestedBufferSize % mux_a->wf->nBlockAlign;
 
-	switch(lavc_param_atag) 
+	switch(lavc_param_atag)
 	{
 		case 0x11: /* imaadpcm */
 			mux_a->wf->wBitsPerSample = 4;
@@ -91,13 +91,13 @@ static int bind_lavc(audio_encoder_t *en
 			break;
 	}
 
-	// Fix allocation    
+	// Fix allocation
 	mux_a->wf = realloc(mux_a->wf, sizeof(WAVEFORMATEX)+mux_a->wf->cbSize);
-	
+
 	encoder->input_format = AF_FORMAT_S16_NE;
 	encoder->min_buffer_size = mux_a->h.dwSuggestedBufferSize;
 	encoder->max_buffer_size = mux_a->h.dwSuggestedBufferSize*2;
-	
+
 	return 1;
 }
 
@@ -163,7 +163,7 @@ int mpae_init_lavc(audio_encoder_t *enco
 {
 	encoder->params.samples_per_frame = encoder->params.sample_rate;
 	encoder->params.bitrate = encoder->params.sample_rate * encoder->params.channels * 2 * 8;
-	
+
 	if(!lavc_param_acodec)
 	{
 		mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_NoLavcAudioCodecName);
@@ -202,7 +202,7 @@ int mpae_init_lavc(audio_encoder_t *enco
 		mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_CouldntAllocateLavcContext);
 		return 0;
 	}
-	
+
 	// put sample parameters
 	lavc_actx->channels = encoder->params.channels;
 	lavc_actx->sample_rate = encoder->params.sample_rate;
@@ -212,7 +212,7 @@ int mpae_init_lavc(audio_encoder_t *enco
                 lavc_actx->bit_rate = encoder->params.bitrate = lavc_param_abitrate * 1000;
         else
                 lavc_actx->bit_rate = encoder->params.bitrate = lavc_param_abitrate;
-	
+
 
 	/*
 	* Special case for adpcm_ima_wav.

Modified: trunk/libmpcodecs/ae_pcm.c
==============================================================================
--- trunk/libmpcodecs/ae_pcm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ae_pcm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -28,11 +28,11 @@ static int bind_pcm(audio_encoder_t *enc
 	mux_a->wf->nAvgBytesPerSec=mux_a->h.dwSampleSize*mux_a->wf->nSamplesPerSec;
 	mux_a->wf->wBitsPerSample=16;
 	mux_a->wf->cbSize=0; // FIXME for l3codeca.acm
-	
+
 	encoder->input_format = (mux_a->wf->wBitsPerSample==8) ? AF_FORMAT_U8 : AF_FORMAT_S16_LE;
 	encoder->min_buffer_size = 16384;
 	encoder->max_buffer_size = mux_a->wf->nAvgBytesPerSec;
-	
+
 	return 1;
 }
 
@@ -70,14 +70,14 @@ int mpae_init_pcm(audio_encoder_t *encod
 {
 	encoder->params.samples_per_frame = encoder->params.sample_rate;
 	encoder->params.bitrate = encoder->params.sample_rate * encoder->params.channels * 2 * 8;
-	
+
 	encoder->decode_buffer_size = encoder->params.bitrate / 8;
 	encoder->bind = bind_pcm;
 	encoder->get_frame_size = get_frame_size;
 	encoder->set_decoded_len = set_decoded_len;
 	encoder->encode = encode_pcm;
 	encoder->close = close_pcm;
-	
+
 	return 1;
 }
 

Modified: trunk/libmpcodecs/ae_toolame.c
==============================================================================
--- trunk/libmpcodecs/ae_toolame.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ae_toolame.c	Wed May 13 04:58:57 2009	(r29305)
@@ -15,16 +15,16 @@
 #include "libmpdemux/mp3_hdr.h"
 
 
-static int 
+static int
     param_bitrate = 192,
     param_psy = 3,
     param_maxvbr = 0,
     param_errprot = 0,
     param_debug = 0;
-    
+
 static float param_vbr = 0;
 static char *param_mode = "stereo";
-    
+
 m_option_t toolameopts_conf[] = {
 	{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"mode", &param_mode, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -40,13 +40,13 @@ m_option_t toolameopts_conf[] = {
 static int bind_toolame(audio_encoder_t *encoder, muxer_stream_t *mux_a)
 {
 	mpae_toolame_ctx *ctx = (mpae_toolame_ctx *) encoder->priv;
-	
+
 	mux_a->wf = malloc(sizeof(WAVEFORMATEX)+256);
 	mux_a->wf->wFormatTag = 0x50;
 	mux_a->wf->nChannels = encoder->params.channels;
 	mux_a->wf->nSamplesPerSec = encoder->params.sample_rate;
 	mux_a->wf->nAvgBytesPerSec = 125 * encoder->params.bitrate;
-	
+
 	if(ctx->vbr || ((mux_a->wf->nAvgBytesPerSec * encoder->params.samples_per_frame) % mux_a->wf->nSamplesPerSec))
 	{
 		mux_a->h.dwScale = encoder->params.samples_per_frame;
@@ -62,7 +62,7 @@ static int bind_toolame(audio_encoder_t 
 	mux_a->wf->nBlockAlign = mux_a->h.dwScale;
 	mux_a->h.dwSuggestedBufferSize = (encoder->params.audio_preload*mux_a->wf->nAvgBytesPerSec)/1000;
 	mux_a->h.dwSuggestedBufferSize -= mux_a->h.dwSuggestedBufferSize % mux_a->wf->nBlockAlign;
-	
+
 	mux_a->wf->cbSize = 0; //12;
 	mux_a->wf->wBitsPerSample = 0; /* does not apply */
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->wID = 1;
@@ -70,10 +70,10 @@ static int bind_toolame(audio_encoder_t 
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nBlockSize = mux_a->wf->nBlockAlign;
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nFramesPerBlock = 1;
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nCodecDelay = 0;
-	
-	// Fix allocation    
+
+	// Fix allocation
 	mux_a->wf = realloc(mux_a->wf, sizeof(WAVEFORMATEX)+mux_a->wf->cbSize);
-	
+
 	encoder->input_format = AF_FORMAT_S16_NE;
 	encoder->min_buffer_size = mux_a->h.dwSuggestedBufferSize;
 	encoder->max_buffer_size = mux_a->h.dwSuggestedBufferSize*2;
@@ -86,7 +86,7 @@ static int encode_toolame(audio_encoder_
 	mpae_toolame_ctx *ctx = (mpae_toolame_ctx *)encoder->priv;
 	int ret_size = 0, r2, i, nsamples;
 	int16_t *buffer;
-	
+
 	nsamples = len / (2*encoder->params.channels);
 	buffer = (uint16_t *) src;
 	for(i = 0; i < nsamples; i++)
@@ -94,9 +94,9 @@ static int encode_toolame(audio_encoder_
 	    ctx->left_pcm[i] = buffer[ctx->channels * i];
 	    ctx->right_pcm[i] = buffer[(ctx->channels * i) + (ctx->channels - 1)];
 	}
-	
+
 	toolame_encode_buffer(ctx->toolame_ctx, ctx->left_pcm, ctx->right_pcm, nsamples, dest, max_size, &ret_size);
-	r2 = mp_decode_mp3_header(dest);	
+	r2 = mp_decode_mp3_header(dest);
 	mp_msg(MSGT_MENCODER, MSGL_DBG2, "\nSIZE: %d, max: %d, r2: %d\n", ret_size, max_size, r2);
 	if(r2 > 0)
 		ret_size = r2;
@@ -125,7 +125,7 @@ int mpae_init_toolame(audio_encoder_t *e
 {
 	int mode;
 	mpae_toolame_ctx *ctx = NULL;
-	
+
 	if(encoder->params.channels == 1)
 	{
 		mp_msg(MSGT_MENCODER, MSGL_INFO, "ae_toolame, 1 audio channel, forcing mono mode\n");
@@ -146,14 +146,14 @@ int mpae_init_toolame(audio_encoder_t *e
 	}
 	else
 		mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_toolame, Toolame can't encode > 2 channels, exiting\n");
-	
+
 	ctx = (mpae_toolame_ctx *) calloc(1, sizeof(mpae_toolame_ctx));
 	if(ctx == NULL)
 	{
 		mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_toolame, couldn't alloc a %d bytes context, exiting\n", sizeof(mpae_toolame_ctx));
 		return 0;
 	}
-	
+
 	ctx->toolame_ctx = toolame_init();
 	if(ctx->toolame_ctx == NULL)
 	{
@@ -167,20 +167,20 @@ int mpae_init_toolame(audio_encoder_t *e
 
 	if(toolame_setMode(ctx->toolame_ctx, mode) != 0)
 		return 0;
-	
+
 	if(toolame_setPsymodel(ctx->toolame_ctx, param_psy) != 0)
 		return 0;
-	
+
 	if(toolame_setSampleFreq(ctx->toolame_ctx, encoder->params.sample_rate) != 0)
 		return 0;
-	
+
 	if(toolame_setBitrate(ctx->toolame_ctx, param_bitrate) != 0)
 		return 0;
-	
+
 	if(param_errprot)
 		if(toolame_setErrorProtection(ctx->toolame_ctx, TRUE) != 0)
 			return 0;
-	
+
 	if(param_vbr != 0)
 	{
 		if(toolame_setVBR(ctx->toolame_ctx, TRUE) != 0)
@@ -196,24 +196,24 @@ int mpae_init_toolame(audio_encoder_t *e
 		}
 		ctx->vbr = 1;
 	}
-	
+
 	if(toolame_setVerbosity(ctx->toolame_ctx, param_debug) != 0)
 		return 0;
-	
+
 	if(toolame_init_params(ctx->toolame_ctx) != 0)
 		return 0;
-	
+
 	ctx->bitrate = param_bitrate;
 	encoder->params.bitrate = ctx->bitrate;
 	encoder->params.samples_per_frame = 1152;
 	encoder->priv = ctx;
 	encoder->decode_buffer_size = 1152 * 2 * encoder->params.channels;
-	
+
 	encoder->bind = bind_toolame;
 	encoder->get_frame_size = get_frame_size;
 	encoder->encode = encode_toolame;
 	encoder->close = close_toolame;
-	
+
 	return 1;
 }
 

Modified: trunk/libmpcodecs/ae_twolame.c
==============================================================================
--- trunk/libmpcodecs/ae_twolame.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ae_twolame.c	Wed May 13 04:58:57 2009	(r29305)
@@ -15,16 +15,16 @@
 #include "libmpdemux/mp3_hdr.h"
 
 
-static int 
+static int
     param_bitrate = 192,
     param_psy = 3,
     param_maxvbr = 0,
     param_errprot = 0,
     param_debug = 0;
-    
+
 static float param_vbr = 0;
 static char *param_mode = "stereo";
-    
+
 m_option_t twolameopts_conf[] = {
 	{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"mode", &param_mode, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -40,13 +40,13 @@ m_option_t twolameopts_conf[] = {
 static int bind_twolame(audio_encoder_t *encoder, muxer_stream_t *mux_a)
 {
 	mpae_twolame_ctx *ctx = encoder->priv;
-	
+
 	mux_a->wf = malloc(sizeof(WAVEFORMATEX)+256);
 	mux_a->wf->wFormatTag = 0x50;
 	mux_a->wf->nChannels = encoder->params.channels;
 	mux_a->wf->nSamplesPerSec = encoder->params.sample_rate;
 	mux_a->wf->nAvgBytesPerSec = encoder->params.bitrate / 8;
-	
+
 	if(ctx->vbr || ((mux_a->wf->nAvgBytesPerSec * encoder->params.samples_per_frame) % mux_a->wf->nSamplesPerSec))
 	{
 		mux_a->h.dwScale = encoder->params.samples_per_frame;
@@ -62,7 +62,7 @@ static int bind_twolame(audio_encoder_t 
 	mux_a->wf->nBlockAlign = mux_a->h.dwScale;
 	mux_a->h.dwSuggestedBufferSize = (encoder->params.audio_preload*mux_a->wf->nAvgBytesPerSec)/1000;
 	mux_a->h.dwSuggestedBufferSize -= mux_a->h.dwSuggestedBufferSize % mux_a->wf->nBlockAlign;
-	
+
 	mux_a->wf->cbSize = 0; //12;
 	mux_a->wf->wBitsPerSample = 0; /* does not apply */
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->wID = 1;
@@ -70,10 +70,10 @@ static int bind_twolame(audio_encoder_t 
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nBlockSize = mux_a->wf->nBlockAlign;
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nFramesPerBlock = 1;
 	((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nCodecDelay = 0;
-	
-	// Fix allocation    
+
+	// Fix allocation
 	mux_a->wf = realloc(mux_a->wf, sizeof(WAVEFORMATEX)+mux_a->wf->cbSize);
-	
+
 	encoder->input_format = AF_FORMAT_S16_NE;
 	encoder->min_buffer_size = mux_a->h.dwSuggestedBufferSize;
 	encoder->max_buffer_size = mux_a->h.dwSuggestedBufferSize*2;
@@ -85,10 +85,10 @@ static int encode_twolame(audio_encoder_
 {
 	mpae_twolame_ctx *ctx = encoder->priv;
 	int ret_size = 0, r2;
-	
+
 	len /= (2*encoder->params.channels);
 	ret_size = twolame_encode_buffer_interleaved(ctx->twolame_ctx, src, len, dest, max_size);
-	r2 = mp_decode_mp3_header(dest);	
+	r2 = mp_decode_mp3_header(dest);
 	mp_msg(MSGT_MENCODER, MSGL_DBG2, "\nSIZE: %d, max: %d, r2: %d\n", ret_size, max_size, r2);
 	if(r2 > 0)
 		ret_size = r2;
@@ -117,7 +117,7 @@ int mpae_init_twolame(audio_encoder_t *e
 {
 	int mode;
 	mpae_twolame_ctx *ctx = NULL;
-	
+
 	if(encoder->params.channels == 1)
 	{
 		mp_msg(MSGT_MENCODER, MSGL_INFO, "ae_twolame, 1 audio channel, forcing mono mode\n");
@@ -138,14 +138,14 @@ int mpae_init_twolame(audio_encoder_t *e
 	}
 	else
 		mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_twolame, Twolame can't encode > 2 channels, exiting\n");
-	
+
 	ctx = calloc(1, sizeof(mpae_twolame_ctx));
 	if(ctx == NULL)
 	{
 		mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_twolame, couldn't alloc a %d bytes context, exiting\n", sizeof(mpae_twolame_ctx));
 		return 0;
 	}
-	
+
 	ctx->twolame_ctx = twolame_init();
 	if(ctx->twolame_ctx == NULL)
 	{
@@ -159,28 +159,28 @@ int mpae_init_twolame(audio_encoder_t *e
 		return 0;
 	if(twolame_set_mode(ctx->twolame_ctx, mode) != 0)
 		return 0;
-		
+
 	if(twolame_set_in_samplerate(ctx->twolame_ctx, encoder->params.sample_rate) != 0)
 		return 0;
-		
+
 	if(twolame_set_out_samplerate(ctx->twolame_ctx, encoder->params.sample_rate) != 0)
 		return 0;
-	
+
 	if(encoder->params.sample_rate < 32000)
 		twolame_set_version(ctx->twolame_ctx, TWOLAME_MPEG2);
 	else
 		twolame_set_version(ctx->twolame_ctx, TWOLAME_MPEG1);
-	
+
 	if(twolame_set_psymodel(ctx->twolame_ctx, param_psy) != 0)
 		return 0;
-	
+
 	if(twolame_set_bitrate(ctx->twolame_ctx, param_bitrate) != 0)
 		return 0;
-	
+
 	if(param_errprot)
 		if(twolame_set_error_protection(ctx->twolame_ctx, TRUE) != 0)
 			return 0;
-	
+
 	if(param_vbr != 0)
 	{
 		if(twolame_set_VBR(ctx->twolame_ctx, TRUE) != 0)
@@ -196,23 +196,23 @@ int mpae_init_twolame(audio_encoder_t *e
 		}
 		ctx->vbr = 1;
 	}
-	
+
 	if(twolame_set_verbosity(ctx->twolame_ctx, param_debug) != 0)
 		return 0;
-	
+
 	if(twolame_init_params(ctx->twolame_ctx) != 0)
 		return 0;
-	
+
 	encoder->params.bitrate = param_bitrate * 1000;
 	encoder->params.samples_per_frame = 1152;
 	encoder->priv = ctx;
 	encoder->decode_buffer_size = 1152 * 2 * encoder->params.channels;
-	
+
 	encoder->bind = bind_twolame;
 	encoder->get_frame_size = get_frame_size;
 	encoder->encode = encode_twolame;
 	encoder->close = close_twolame;
-	
+
 	return 1;
 }
 

Modified: trunk/libmpcodecs/mp_image.c
==============================================================================
--- trunk/libmpcodecs/mp_image.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/mp_image.c	Wed May 13 04:58:57 2009	(r29305)
@@ -45,7 +45,7 @@ mp_image_t* alloc_mpi(int w, int h, unsi
     if(!mpi->stride[0]) mpi->stride[0]=mpi->width*mpi->bpp/8;
   }
   mpi->flags|=MP_IMGFLAG_ALLOCATED;
-  
+
   return mpi;
 }
 
@@ -58,7 +58,7 @@ void copy_mpi(mp_image_t *dmpi, mp_image
     memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->chroma_width, mpi->chroma_height,
 	       dmpi->stride[2],mpi->stride[2]);
   } else {
-    memcpy_pic(dmpi->planes[0],mpi->planes[0], 
+    memcpy_pic(dmpi->planes[0],mpi->planes[0],
 	       mpi->w*(dmpi->bpp/8), mpi->h,
 	       dmpi->stride[0],mpi->stride[0]);
   }

Modified: trunk/libmpcodecs/native/rtjpegn.c
==============================================================================
--- trunk/libmpcodecs/native/rtjpegn.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/native/rtjpegn.c	Wed May 13 04:58:57 2009	(r29305)
@@ -1,6 +1,6 @@
-/* 
+/*
    RTjpeg (C) Justin Schoeman 1998 (justin at suntiger.ee.up.ac.za)
-   
+
    With modifications by:
    (c) 1998, 1999 by Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
    and
@@ -55,14 +55,14 @@ static const unsigned char RTjpeg_ZZ[64]
 63 };
 
 static const __u64 RTjpeg_aan_tab[64]={
-4294967296ULL, 5957222912ULL, 5611718144ULL, 5050464768ULL, 4294967296ULL, 3374581504ULL, 2324432128ULL, 1184891264ULL, 
-5957222912ULL, 8263040512ULL, 7783580160ULL, 7005009920ULL, 5957222912ULL, 4680582144ULL, 3224107520ULL, 1643641088ULL, 
-5611718144ULL, 7783580160ULL, 7331904512ULL, 6598688768ULL, 5611718144ULL, 4408998912ULL, 3036936960ULL, 1548224000ULL, 
-5050464768ULL, 7005009920ULL, 6598688768ULL, 5938608128ULL, 5050464768ULL, 3968072960ULL, 2733115392ULL, 1393296000ULL, 
-4294967296ULL, 5957222912ULL, 5611718144ULL, 5050464768ULL, 4294967296ULL, 3374581504ULL, 2324432128ULL, 1184891264ULL, 
-3374581504ULL, 4680582144ULL, 4408998912ULL, 3968072960ULL, 3374581504ULL, 2651326208ULL, 1826357504ULL, 931136000ULL, 
-2324432128ULL, 3224107520ULL, 3036936960ULL, 2733115392ULL, 2324432128ULL, 1826357504ULL, 1258030336ULL, 641204288ULL, 
-1184891264ULL, 1643641088ULL, 1548224000ULL, 1393296000ULL, 1184891264ULL, 931136000ULL, 641204288ULL, 326894240ULL, 
+4294967296ULL, 5957222912ULL, 5611718144ULL, 5050464768ULL, 4294967296ULL, 3374581504ULL, 2324432128ULL, 1184891264ULL,
+5957222912ULL, 8263040512ULL, 7783580160ULL, 7005009920ULL, 5957222912ULL, 4680582144ULL, 3224107520ULL, 1643641088ULL,
+5611718144ULL, 7783580160ULL, 7331904512ULL, 6598688768ULL, 5611718144ULL, 4408998912ULL, 3036936960ULL, 1548224000ULL,
+5050464768ULL, 7005009920ULL, 6598688768ULL, 5938608128ULL, 5050464768ULL, 3968072960ULL, 2733115392ULL, 1393296000ULL,
+4294967296ULL, 5957222912ULL, 5611718144ULL, 5050464768ULL, 4294967296ULL, 3374581504ULL, 2324432128ULL, 1184891264ULL,
+3374581504ULL, 4680582144ULL, 4408998912ULL, 3968072960ULL, 3374581504ULL, 2651326208ULL, 1826357504ULL, 931136000ULL,
+2324432128ULL, 3224107520ULL, 3036936960ULL, 2733115392ULL, 2324432128ULL, 1826357504ULL, 1258030336ULL, 641204288ULL,
+1184891264ULL, 1643641088ULL, 1548224000ULL, 1393296000ULL, 1184891264ULL, 931136000ULL, 641204288ULL, 326894240ULL,
 };
 
 #if !HAVE_MMX
@@ -115,7 +115,7 @@ static const unsigned char RTjpeg_chrom_
     99,  99,  99,  99,  99,  99,  99,  99
  };
 
-#ifdef BETTERCOMPRESSION 
+#ifdef BETTERCOMPRESSION
 
 /*--------------------------------------------------*/
 /*  better encoding, but needs a lot more cpu time  */
@@ -160,19 +160,19 @@ static int RTjpeg_b2s(__s16 *data, __s8 
  bitten = ((unsigned char)ci) << 2;
 
  if (ci==0) {
-   ((__u8*)strm)[1]= bitten; 
+   ((__u8*)strm)[1]= bitten;
    co = 2;
    return (int)co;
  }
- 
- /* bitoff=0 because the high 6bit contain first non zero position */ 
+
+ /* bitoff=0 because the high 6bit contain first non zero position */
  bitoff = 0;
  co = 1;
 
  for(; ci>0; ci--) {
 
    ZZvalue = data[RTjpeg_ZZ[ci]];
-   
+
    switch(ZZvalue) {
    case 0:
 	break;
@@ -189,21 +189,21 @@ static int RTjpeg_b2s(__s16 *data, __s8 
    }
 
    if( bitoff == 0 ) {
-      ((__u8*)strm)[co]= bitten; 
+      ((__u8*)strm)[co]= bitten;
       bitten = 0;
-      bitoff = 8; 
+      bitoff = 8;
       co++;
    } /* "fall through" */
-   bitoff-=2; 
+   bitoff-=2;
 
  }
- 
+
  /* ci must be 0 */
  if(bitoff != 6) {
 
-      ((__u8*)strm)[co]= bitten; 
+      ((__u8*)strm)[co]= bitten;
       co++;
-     
+
  }
  goto BAUCHWEH;
 
@@ -218,7 +218,7 @@ HERZWEH:
    break;
  case 2:
  case 0:
-   ((__u8*)strm)[co]= bitten; 
+   ((__u8*)strm)[co]= bitten;
    bitoff = 4;
    co++;
    bitten = 0; // clear half nibble values in bitten
@@ -234,48 +234,48 @@ HERZWEH:
    if( (ZZvalue > 7) || (ZZvalue < -7) ) {
         bitten |= (0x08<<bitoff);
 	goto HIRNWEH;
-   } 
-   
+   }
+
    bitten |= (ZZvalue&0xf)<<bitoff;
 
    if( bitoff == 0 ) {
-      ((__u8*)strm)[co]= bitten; 
+      ((__u8*)strm)[co]= bitten;
       bitten = 0;
       bitoff = 8;
       co++;
    } /* "fall thru" */
    bitoff-=4;
  }
- 
+
  /* ci must be 0 */
  if( bitoff == 0 ) {
-    ((__u8*)strm)[co]= bitten; 
+    ((__u8*)strm)[co]= bitten;
     co++;
- }  
+ }
  goto BAUCHWEH;
 
 HIRNWEH:
 
- ((__u8*)strm)[co]= bitten; 
+ ((__u8*)strm)[co]= bitten;
  co++;
-  
+
 
  /* bitting is over now we bite */
  for(; ci>0; ci--) {
 
    ZZvalue = data[RTjpeg_ZZ[ci]];
 
-   if(ZZvalue>0) 
+   if(ZZvalue>0)
    {
      strm[co++]=(__s8)(ZZvalue>127)?127:ZZvalue;
-   } 
-   else 
+   }
+   else
    {
      strm[co++]=(__s8)(ZZvalue<-128)?-128:ZZvalue;
    }
 
  }
- 
+
 
 BAUCHWEH:
   /* we gotoo much now we are ill */
@@ -312,39 +312,39 @@ static int RTjpeg_b2s(__s16 *data, __s8 
 
  (__u8)strm[0]=(__u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
 
- for(ci=1; ci<=bt8; ci++) 
+ for(ci=1; ci<=bt8; ci++)
  {
 	ZZvalue = data[RTjpeg_ZZ[ci]];
 
-   if(ZZvalue>0) 
+   if(ZZvalue>0)
 	{
      strm[co++]=(__s8)(ZZvalue>127)?127:ZZvalue;
-   } 
-	else 
+   }
+	else
 	{
      strm[co++]=(__s8)(ZZvalue<-128)?-128:ZZvalue;
    }
  }
 
- for(; ci<64; ci++) 
+ for(; ci<64; ci++)
  {
   ZZvalue = data[RTjpeg_ZZ[ci]];
 
   if(ZZvalue>0)
   {
    strm[co++]=(__s8)(ZZvalue>63)?63:ZZvalue;
-  } 
+  }
   else if(ZZvalue<0)
   {
    strm[co++]=(__s8)(ZZvalue<-64)?-64:ZZvalue;
-  } 
+  }
   else /* compress zeros */
   {
    tmp=ci;
    do
    {
     ci++;
-   } 
+   }
 	while((ci<64)&&(data[RTjpeg_ZZ[ci]]==0));
 
    strm[co++]=(__s8)(63+(ci-tmp));
@@ -367,7 +367,7 @@ static int RTjpeg_s2b(__s16 *data, __s8 
   i=RTjpeg_ZZ[co];
   data[i]=strm[ci++]*qtbl[i];
  }
- 
+
  for(; co<64; co++)
  {
   if(strm[ci]>63)
@@ -391,7 +391,7 @@ static void RTjpeg_quant_init(void)
 {
  int i;
  __s16 *qtbl;
- 
+
  qtbl=(__s16 *)RTjpeg_lqt;
  for(i=0; i<64; i++)qtbl[i]=(__s16)RTjpeg_lqt[i];
 
@@ -406,36 +406,36 @@ static void RTjpeg_quant(__s16 *block, _
 {
  int i;
  mmx_t *bl, *ql;
- 
+
  ql=(mmx_t *)qtbl;
  bl=(mmx_t *)block;
- 
+
  movq_m2r(RTjpeg_ones, mm6);
  movq_m2r(RTjpeg_half, mm7);
 
- for(i=16; i; i--) 
+ for(i=16; i; i--)
  {
   movq_m2r(*(ql++), mm0); /* quant vals (4) */
   movq_m2r(*bl, mm2); /* block vals (4) */
   movq_r2r(mm0, mm1);
   movq_r2r(mm2, mm3);
-  
+
   punpcklwd_r2r(mm6, mm0); /*           1 qb 1 qa */
   punpckhwd_r2r(mm6, mm1); /* 1 qd 1 qc */
-  
+
   punpcklwd_r2r(mm7, mm2); /*                   32767 bb 32767 ba */
   punpckhwd_r2r(mm7, mm3); /* 32767 bd 32767 bc */
-  
+
   pmaddwd_r2r(mm2, mm0); /*                         32767+bb*qb 32767+ba*qa */
   pmaddwd_r2r(mm3, mm1); /* 32767+bd*qd 32767+bc*qc */
-  
+
   psrad_i2r(16, mm0);
   psrad_i2r(16, mm1);
-  
+
   packssdw_r2r(mm1, mm0);
-  
+
   movq_r2m(mm0, *(bl++));
-  
+
  }
 }
 #else
@@ -446,7 +446,7 @@ static void RTjpeg_quant_init(void)
 static void RTjpeg_quant(__s16 *block, __s32 *qtbl)
 {
  int i;
- 
+
  for(i=0; i<64; i++)
    block[i]=(__s16)((block[i]*qtbl[i]+32767)>>16);
 }
@@ -477,7 +477,7 @@ static mmx_t RTjpeg_zero ={0x00000000000
 static void RTjpeg_dct_init(void)
 {
  int i;
- 
+
  for(i=0; i<64; i++)
  {
   RTjpeg_lqt[i]=(((__u64)RTjpeg_lqt[i]<<32)/RTjpeg_aan_tab[i]);
@@ -507,19 +507,19 @@ static void RTjpeg_dctY(__u8 *idata, __s
     tmp5 = idataptr[2] - idataptr[5];
     tmp3 = idataptr[3] + idataptr[4];
     tmp4 = idataptr[3] - idataptr[4];
-    
+
     tmp10 = (tmp0 + tmp3);	/* phase 2 */
     tmp13 = tmp0 - tmp3;
     tmp11 = (tmp1 + tmp2);
     tmp12 = tmp1 - tmp2;
-    
+
     wsptr[0] = (tmp10 + tmp11)<<8; /* phase 3 */
     wsptr[4] = (tmp10 - tmp11)<<8;
-    
+
     z1 = D_MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
     wsptr[2] = (tmp13<<8) + z1;	/* phase 5 */
     wsptr[6] = (tmp13<<8) - z1;
-    
+
     tmp10 = tmp4 + tmp5;	/* phase 2 */
     tmp11 = tmp5 + tmp6;
     tmp12 = tmp6 + tmp7;
@@ -552,15 +552,15 @@ static void RTjpeg_dctY(__u8 *idata, __s
     tmp5 = wsptr[16] - wsptr[40];
     tmp3 = wsptr[24] + wsptr[32];
     tmp4 = wsptr[24] - wsptr[32];
-    
+
     tmp10 = tmp0 + tmp3;	/* phase 2 */
     tmp13 = tmp0 - tmp3;
     tmp11 = tmp1 + tmp2;
     tmp12 = tmp1 - tmp2;
-    
+
     odataptr[0] = DESCALE10(tmp10 + tmp11); /* phase 3 */
     odataptr[32] = DESCALE10(tmp10 - tmp11);
-    
+
     z1 = D_MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
     odataptr[16] = DESCALE20((tmp13<<8) + z1); /* phase 5 */
     odataptr[48] = DESCALE20((tmp13<<8) - z1);
@@ -595,85 +595,85 @@ static void RTjpeg_dctY(__u8 *idata, __s
    movq_m2r(RTjpeg_zero, mm2);
 
 
-	movq_m2r(*idata2, mm0);		 
-	movq_r2r(mm0, mm1);		 			
+	movq_m2r(*idata2, mm0);
+	movq_r2r(mm0, mm1);
 
 	punpcklbw_r2r(mm2, mm0);
 	movq_r2m(mm0, *(dataptr));
 
 	punpckhbw_r2r(mm2, mm1);
 	movq_r2m(mm1, *(dataptr+1));
-	
+
 	idata2 += rskip;
 
-	movq_m2r(*idata2, mm0);		 
-	movq_r2r(mm0, mm1);		 			
+	movq_m2r(*idata2, mm0);
+	movq_r2r(mm0, mm1);
 
 	punpcklbw_r2r(mm2, mm0);
 	movq_r2m(mm0, *(dataptr+2));
 
 	punpckhbw_r2r(mm2, mm1);
 	movq_r2m(mm1, *(dataptr+3));
-	
+
 	idata2 += rskip;
 
-	movq_m2r(*idata2, mm0);		 
-	movq_r2r(mm0, mm1);		 			
+	movq_m2r(*idata2, mm0);
+	movq_r2r(mm0, mm1);
 
 	punpcklbw_r2r(mm2, mm0);
 	movq_r2m(mm0, *(dataptr+4));
 
 	punpckhbw_r2r(mm2, mm1);
 	movq_r2m(mm1, *(dataptr+5));
-	
+
 	idata2 += rskip;
 
-	movq_m2r(*idata2, mm0);		 
-	movq_r2r(mm0, mm1);		 			
+	movq_m2r(*idata2, mm0);
+	movq_r2r(mm0, mm1);
 
 	punpcklbw_r2r(mm2, mm0);
 	movq_r2m(mm0, *(dataptr+6));
 
 	punpckhbw_r2r(mm2, mm1);
 	movq_r2m(mm1, *(dataptr+7));
-	
+
 	idata2 += rskip;
 
-	movq_m2r(*idata2, mm0);		 
-	movq_r2r(mm0, mm1);		 			
+	movq_m2r(*idata2, mm0);
+	movq_r2r(mm0, mm1);
 
 	punpcklbw_r2r(mm2, mm0);
 	movq_r2m(mm0, *(dataptr+8));
 
 	punpckhbw_r2r(mm2, mm1);
 	movq_r2m(mm1, *(dataptr+9));
-	
+
 	idata2 += rskip;
 
-	movq_m2r(*idata2, mm0);		 
-	movq_r2r(mm0, mm1);		 			
+	movq_m2r(*idata2, mm0);
+	movq_r2r(mm0, mm1);
 
 	punpcklbw_r2r(mm2, mm0);
 	movq_r2m(mm0, *(dataptr+10));
 
 	punpckhbw_r2r(mm2, mm1);
 	movq_r2m(mm1, *(dataptr+11));
-	
+
 	idata2 += rskip;
 
-	movq_m2r(*idata2, mm0);		 
-	movq_r2r(mm0, mm1);		 			
+	movq_m2r(*idata2, mm0);
+	movq_r2r(mm0, mm1);
 
 	punpcklbw_r2r(mm2, mm0);
 	movq_r2m(mm0, *(dataptr+12));
 
 	punpckhbw_r2r(mm2, mm1);
 	movq_r2m(mm1, *(dataptr+13));
-	
+
 	idata2 += rskip;
 
-	movq_m2r(*idata2, mm0);		 
-	movq_r2r(mm0, mm1);		 			
+	movq_m2r(*idata2, mm0);
+	movq_r2r(mm0, mm1);
 
 	punpcklbw_r2r(mm2, mm0);
 	movq_r2m(mm0, *(dataptr+14));
@@ -686,15 +686,15 @@ static void RTjpeg_dctY(__u8 *idata, __s
 	movq_m2r(*(dataptr+9), mm7);		 	// m03:m02|m01:m00 - first line (line 4)and copy into m5
 
 	movq_m2r(*(dataptr+13), mm6);	    	// m23:m22|m21:m20 - third line (line 6)and copy into m2
-	movq_r2r(mm7, mm5);		 			
+	movq_r2r(mm7, mm5);
 
 	punpcklwd_m2r(*(dataptr+11), mm7); 	// m11:m01|m10:m00 - interleave first and second lines
-	movq_r2r(mm6, mm2);						 
+	movq_r2r(mm6, mm2);
 
 	punpcklwd_m2r(*(dataptr+15), mm6);  // m31:m21|m30:m20 - interleave third and fourth lines
 	movq_r2r(mm7, mm1);
 
-	movq_m2r(*(dataptr+11), mm3);	      // m13:m13|m11:m10 - second line	 
+	movq_m2r(*(dataptr+11), mm3);	      // m13:m13|m11:m10 - second line
 	punpckldq_r2r(mm6, mm7);				// m30:m20|m10:m00 - interleave to produce result 1
 
 	movq_m2r(*(dataptr+15), mm0);	      // m13:m13|m11:m10 - fourth line
@@ -702,7 +702,7 @@ static void RTjpeg_dctY(__u8 *idata, __s
 
 	movq_r2m(mm7,*(dataptr+9));			// write result 1
 	punpckhwd_r2r(mm3, mm5);				// m13:m03|m12:m02 - interleave first and second lines
-	
+
 	movq_r2m(mm1,*(dataptr+11));			// write result 2
 	punpckhwd_r2r(mm0, mm2);				// m33:m23|m32:m22 - interleave third and fourth lines
 
@@ -728,7 +728,7 @@ static void RTjpeg_dctY(__u8 *idata, __s
 	movq_r2r(mm0, mm4);
 
 	//
-	movq_m2r(*(dataptr+8), mm1);			// n03:n02|n01:n00 - first line 
+	movq_m2r(*(dataptr+8), mm1);			// n03:n02|n01:n00 - first line
 	punpckldq_r2r(mm2, mm0);				// m30:m20|m10:m00 - interleave to produce first result
 
 	movq_m2r(*(dataptr+12), mm3);			// n23:n22|n21:n20 - third line
@@ -843,14 +843,14 @@ static void RTjpeg_dctY(__u8 *idata, __s
    movq_r2r(mm0, mm3);
 
 	psllw_i2r(2, mm6);			// m8 * 2^2
-	paddw_r2r(mm1, mm0);		
+	paddw_r2r(mm1, mm0);
 
 	pmulhw_m2r(RTjpeg_C4, mm6);			// z1
-	psubw_r2r(mm1, mm3);		
+	psubw_r2r(mm1, mm3);
 
    movq_r2m(mm0, *dataptr);
    movq_r2r(mm7, mm0);
-   
+
     /* Odd part */
    movq_r2m(mm3, *(dataptr+8));
 	paddw_r2r(mm5, mm4);						// tmp10
@@ -872,7 +872,7 @@ static void RTjpeg_dctY(__u8 *idata, __s
 	psubw_r2r(mm2, mm1);						// tmp10 - tmp12
 	psllw_i2r(2, mm4);			// m8 * 2^2
 
-	movq_m2r(RTjpeg_C2mC6, mm0);		
+	movq_m2r(RTjpeg_C2mC6, mm0);
 	psllw_i2r(2, mm1);
 
 	pmulhw_m2r(RTjpeg_C6, mm1);			// z5
@@ -972,7 +972,7 @@ static void RTjpeg_dctY(__u8 *idata, __s
 
    movq_r2m(mm0, *(dataptr+1)); 			//save y0
 	movq_r2r(mm7, mm0);						// copy tmp13
-  
+
 	/* odd part */
 
    movq_r2m(mm3, *(dataptr+9)); 			//save y4
@@ -999,14 +999,14 @@ static void RTjpeg_dctY(__u8 *idata, __s
 	psllw_i2r(2, mm1);			// shift (tmp10-tmp12)
 
 	pmulhw_m2r(RTjpeg_C6, mm1);    		// z5
-	psllw_i2r(2, mm5);			// prepare for multiply 
+	psllw_i2r(2, mm5);			// prepare for multiply
 
 	pmulhw_r2r(mm0, mm4);					// multiply by converted real
 
 	/* stage 5 */
 
 	pmulhw_m2r(RTjpeg_C4, mm5);			// z3
-	psllw_i2r(2, mm2);			// prepare for multiply 
+	psllw_i2r(2, mm2);			// prepare for multiply
 
 	pmulhw_m2r(RTjpeg_C2pC6, mm2);		// multiply
 	movq_r2r(mm3, mm0);						// copy tmp7
@@ -1032,7 +1032,7 @@ static void RTjpeg_dctY(__u8 *idata, __s
 
    movq_r2m(mm6, *(dataptr+3)); 			//save y1
 	psubw_r2r(mm2, mm0);						// y7
-	
+
 /************************************************************************************************
 					Start of Transpose
 ************************************************************************************************/
@@ -1077,9 +1077,9 @@ static void RTjpeg_dctY(__u8 *idata, __s
 	punpcklwd_m2r(*(dataptr+7), mm2);  	// m31:m21|m30:m20 - interleave third and fourth lines
 	movq_r2r(mm0, mm4);						// copy first intermediate result
 
-	
 
-	movq_m2r(*(dataptr+8), mm1);			// n03:n02|n01:n00 - first line 
+
+	movq_m2r(*(dataptr+8), mm1);			// n03:n02|n01:n00 - first line
 	punpckldq_r2r(mm2, mm0);				// m30:m20|m10:m00 - interleave to produce first result
 
 	movq_m2r(*(dataptr+12), mm3);			// n23:n22|n21:n20 - third line
@@ -1106,7 +1106,7 @@ static void RTjpeg_dctY(__u8 *idata, __s
 	movq_r2r(mm1, mm4);						// copy second intermediate result
 
 	movq_r2m(mm6, *(dataptr+12));			// write result 3 out
-	punpckldq_r2r(mm3, mm1);				// 
+	punpckldq_r2r(mm3, mm1);				//
 
 	punpckhwd_m2r(*(dataptr+14), mm0);  // n33:n23|n32:n22 - interleave third and fourth lines
 	movq_r2r(mm2, mm6);						// copy second intermediate result
@@ -1133,7 +1133,7 @@ static void RTjpeg_dctY(__u8 *idata, __s
 
 	punpcklwd_m2r(*(dataptr+2), mm0);  	// m11:m01|m10:m00 - interleave first and second lines
 	movq_r2r(mm7, mm4);						// copy third line
-	
+
 	punpcklwd_m2r(*(dataptr+6), mm7);  	// m31:m21|m30:m20 - interleave third and fourth lines
 	movq_r2r(mm0, mm1);						// copy first intermediate result
 
@@ -1193,14 +1193,14 @@ static void RTjpeg_dctY(__u8 *idata, __s
    movq_r2r(mm0, mm3);
 
 	psllw_i2r(2, mm6);			// m8 * 2^2
-	paddw_r2r(mm1, mm0);		
+	paddw_r2r(mm1, mm0);
 
 	pmulhw_m2r(RTjpeg_C4, mm6);			// z1
-	psubw_r2r(mm1, mm3);		
+	psubw_r2r(mm1, mm3);
 
    movq_r2m(mm0, *dataptr);
    movq_r2r(mm7, mm0);
-   
+
     /* Odd part */
    movq_r2m(mm3, *(dataptr+8));
 	paddw_r2r(mm5, mm4);						// tmp10
@@ -1321,7 +1321,7 @@ static void RTjpeg_dctY(__u8 *idata, __s
 
    movq_r2m(mm0, *(dataptr+1)); 			//save y0
 	movq_r2r(mm7, mm0);						// copy tmp13
-  
+
 	/* odd part */
 
    movq_r2m(mm3, *(dataptr+9)); 			//save y4
@@ -1348,14 +1348,14 @@ static void RTjpeg_dctY(__u8 *idata, __s
 	psllw_i2r(2, mm1);			// shift (tmp10-tmp12)
 
 	pmulhw_m2r(RTjpeg_C6, mm1);    		// z5
-	psllw_i2r(2, mm5);			// prepare for multiply 
+	psllw_i2r(2, mm5);			// prepare for multiply
 
 	pmulhw_r2r(mm0, mm4);					// multiply by converted real
 
 	/* stage 5 */
 
 	pmulhw_m2r(RTjpeg_C4, mm5);			// z3
-	psllw_i2r(2, mm2);			// prepare for multiply 
+	psllw_i2r(2, mm2);			// prepare for multiply
 
 	pmulhw_m2r(RTjpeg_C2pC6, mm2);		// multiply
 	movq_r2r(mm3, mm0);						// copy tmp7
@@ -1385,7 +1385,7 @@ static void RTjpeg_dctY(__u8 *idata, __s
    movq_r2m(mm6, *(dataptr+3)); 			//save y1
 
    movq_r2m(mm0, *(dataptr+15)); 		//save y7
-	
+
 
 #endif
 }
@@ -1411,12 +1411,12 @@ Initialise all the cache-aliged data blo
 static void RTjpeg_init_data(void)
 {
  unsigned long dptr;
- 
+
  dptr=(unsigned long)&(RTjpeg_alldata[0]);
  dptr+=32;
  dptr=dptr>>5;
  dptr=dptr<<5; /* cache align data */
- 
+
  RTjpeg_block=(__s16 *)dptr;
  dptr+=sizeof(__s16)*64;
  RTjpeg_lqt=(__s32 *)dptr;
@@ -1443,7 +1443,7 @@ static void RTjpeg_init_Q(__u8 Q)
 {
  int i;
  __u64 qual;
- 
+
  qual=(__u64)Q<<(32-7); /* 32 bit FP, 255=2, 0=0 */
 
  for(i=0; i<64; i++)
@@ -1457,7 +1457,7 @@ static void RTjpeg_init_Q(__u8 Q)
   RTjpeg_lqt[i]=((1<<16)/RTjpeg_liqt[i])>>3;
   RTjpeg_cqt[i]=((1<<16)/RTjpeg_ciqt[i])>>3;
  }
- 
+
  RTjpeg_lb8=0;
  while(RTjpeg_liqt[RTjpeg_ZZ[++RTjpeg_lb8]]<=8);
  RTjpeg_lb8--;
@@ -1475,21 +1475,21 @@ External Function
 
 Initialise compression.
 
-Input: buf -> pointer to 128 ints for quant values store to pass back to 
+Input: buf -> pointer to 128 ints for quant values store to pass back to
                 init_decompress.
        width -> width of image
        height -> height of image
        Q -> quality factor (192=best, 32=worst)
-       
+
 */
 
 void RTjpeg_init_compress(__u32 *buf, int width, int height, __u8 Q)
 {
  int i;
  __u64 qual;
- 
+
  RTjpeg_init_data();
- 
+
  RTjpeg_width=width;
  RTjpeg_height=height;
  RTjpeg_Ywidth = RTjpeg_width>>3;
@@ -1510,14 +1510,14 @@ void RTjpeg_init_compress(__u32 *buf, in
   RTjpeg_lqt[i]=((1<<16)/RTjpeg_liqt[i])>>3;
   RTjpeg_cqt[i]=((1<<16)/RTjpeg_ciqt[i])>>3;
  }
- 
+
  RTjpeg_lb8=0;
  while(RTjpeg_liqt[RTjpeg_ZZ[++RTjpeg_lb8]]<=8);
  RTjpeg_lb8--;
  RTjpeg_cb8=0;
  while(RTjpeg_ciqt[RTjpeg_ZZ[++RTjpeg_cb8]]<=8);
  RTjpeg_cb8--;
- 
+
  RTjpeg_dct_init();
  RTjpeg_quant_init();
 
@@ -1573,7 +1573,7 @@ int RTjpeg_compressYUV420(__s8 *sp, unsi
   bp1+=RTjpeg_width<<4;
   bp2+=RTjpeg_width<<2;
   bp3+=RTjpeg_width<<2;
-			 
+
  }
 #if HAVE_MMX
  emms();
@@ -1617,11 +1617,11 @@ static int RTjpeg_bcomp(__s16 *old, mmx_
  mmx_t *mblock=(mmx_t *)RTjpeg_block;
  volatile mmx_t result;
  static mmx_t neg={0xffffffffffffffffULL};
- 
+
  movq_m2r(*mask, mm7);
  movq_m2r(neg, mm6);
  pxor_r2r(mm5, mm5);
- 
+
  for(i=0; i<8; i++)
  {
   movq_m2r(*(mblock++), mm0);
@@ -1644,7 +1644,7 @@ static int RTjpeg_bcomp(__s16 *old, mmx_
   			por_r2r(mm3, mm5);
  }
  movq_r2m(mm5, result);
- 
+
  if(result.q)
  {
   return 0;
@@ -1683,7 +1683,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
  RTjpeg_lmask=lmask;
  RTjpeg_cmask=cmask;
 #endif
- 
+
  sb=sp;
  block=RTjpeg_old;
 /* Y */
@@ -1696,7 +1696,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
    if(RTjpeg_bcomp(block, &RTjpeg_lmask))
    {
     *((__u8 *)sp++)=255;
-   } 
+   }
 	else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
    block+=64;
 
@@ -1705,7 +1705,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
    if(RTjpeg_bcomp(block, &RTjpeg_lmask))
    {
     *((__u8 *)sp++)=255;
-   } 
+   }
 	else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
    block+=64;
 
@@ -1714,7 +1714,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
    if(RTjpeg_bcomp(block, &RTjpeg_lmask))
    {
     *((__u8 *)sp++)=255;
-   } 
+   }
 	else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
    block+=64;
 
@@ -1723,7 +1723,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
    if(RTjpeg_bcomp(block, &RTjpeg_lmask))
    {
     *((__u8 *)sp++)=255;
-   } 
+   }
 	else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_lb8);
    block+=64;
 
@@ -1732,7 +1732,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
    if(RTjpeg_bcomp(block, &RTjpeg_cmask))
    {
     *((__u8 *)sp++)=255;
-   } 
+   }
 	else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
    block+=64;
 
@@ -1741,7 +1741,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
    if(RTjpeg_bcomp(block, &RTjpeg_cmask))
    {
     *((__u8 *)sp++)=255;
-   } 
+   }
 	else sp+=RTjpeg_b2s(RTjpeg_block, sp, RTjpeg_cb8);
    block+=64;
   }
@@ -1749,7 +1749,7 @@ int RTjpeg_mcompressYUV420(__s8 *sp, uns
   bp1+=RTjpeg_width<<4;
   bp2+=RTjpeg_width<<2;
   bp3+=RTjpeg_width<<2;
-			 
+
  }
 #if HAVE_MMX
  emms();

Modified: trunk/libmpcodecs/native/rtjpegn.h
==============================================================================
--- trunk/libmpcodecs/native/rtjpegn.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/native/rtjpegn.h	Wed May 13 04:58:57 2009	(r29305)
@@ -1,6 +1,6 @@
-/* 
+/*
    RTjpeg (C) Justin Schoeman 1998 (justin at suntiger.ee.up.ac.za)
-   
+
    With modifications by:
    (c) 1998, 1999 by Joerg Walter <trouble at moes.pmnet.uni-oldenburg.de>
    and

Modified: trunk/libmpcodecs/native/xa_gsm.c
==============================================================================
--- trunk/libmpcodecs/native/xa_gsm.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/native/xa_gsm.c	Wed May 13 04:58:57 2009	(r29305)
@@ -74,7 +74,7 @@ word b;
 
 /****************/
 static word gsm_asr (a,n)
-word a; 
+word a;
 int n;
 {
         if (n >= 16) return -(a < 0);
@@ -91,7 +91,7 @@ int n;
 
 /****************/
 static word gsm_asl (a,n)
-word a; 
+word a;
 int n;
 {
         if (n >= 16) return 0;
@@ -151,7 +151,7 @@ register word   * xMc;  /* [0..12]      
 word            mant;
 word            exp;
 register word   * xMp;  /* [0..12]                      OUT     */
-/* 
+/*
  *  This part is for decoding the RPE sequence of coded xMc[0..12]
  *  samples to obtain the xMp[0..12] array.  Table 4.6 is used to get
  *  the mantissa of xmaxc (FAC[0..7]).
@@ -161,7 +161,7 @@ register word   * xMp;  /* [0..12]      
         word    temp, temp1, temp2, temp3;
         longword        ltmp;
 
-        assert( mant >= 0 && mant <= 7 ); 
+        assert( mant >= 0 && mant <= 7 );
 
         temp1 = gsm_FAC[ mant ];        /* see 4.2-15 for mant */
         temp2 = gsm_sub( 6, exp );      /* see 4.2-15 for exp  */
@@ -248,7 +248,7 @@ register word 	* s;
   register longword	ltmp;	/* for GSM_ADD */
   register word		tmp;
 
-  for (k = 160; k--; s++) 
+  for (k = 160; k--; s++)
   {
     tmp = GSM_MULT_R( msr, 28180 );
     msr = GSM_ADD(*s, tmp);  	   /* Deemphasis 	     */
@@ -285,7 +285,7 @@ register word           * drp;     /* [-
          */
         brp = gsm_QLB[ bcr ];
 
-        /*  Computation of the reconstructed short term residual 
+        /*  Computation of the reconstructed short term residual
          *  signal drp[0..39]
          */
         assert(brp != MIN_WORD);
@@ -398,7 +398,7 @@ word    * LARpp;        /* out: decoded 
 }
 
 /* 4.2.9 */
-/* Computation of the quantized reflection coefficients 
+/* Computation of the quantized reflection coefficients
  */
 
 /* 4.2.9.1  Interpolation of the LARpp[1..8] to get the LARp[1..8]
@@ -564,7 +564,7 @@ word		*s;		/* [0..159]		OUT 	*/
   word		erp[40], wt[160];
   word		*drp = S->dp0 + 120;
 
-  for (j=0; j <= 3; j++, xmaxcr++, bcr++, Ncr++, Mcr++, xMcr += 13) 
+  for (j=0; j <= 3; j++, xmaxcr++, bcr++, Ncr++, Mcr++, xMcr += 13)
   {
     Gsm_RPE_Decoding( S, *xmaxcr, *Mcr, xMcr, erp );
     Gsm_Long_Term_Synthesis_Filtering( S, *Ncr, *bcr, erp, drp );
@@ -583,7 +583,7 @@ word		*s;		/* [0..159]		OUT 	*/
  ****-------------------------------------------------------------------****/
 void XA_MSGSM_Decoder(unsigned char *ibuf,unsigned short *obuf)
 { word sr;
-  word  LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4];	
+  word  LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4];
 
   sr = *ibuf++;
 
@@ -773,7 +773,7 @@ void XA_MSGSM_Decoder(unsigned char *ibu
   xmaxc[2] = sr & 0x3f;  sr >>= 6;
   xmc[26] = sr & 0x7;  sr >>= 3;
   xmc[27] = sr & 0x7;  sr >>= 3;
-  sr |= (word)*ibuf++ << 1;	
+  sr |= (word)*ibuf++ << 1;
   xmc[28] = sr & 0x7;  sr >>= 3;
   xmc[29] = sr & 0x7;  sr >>= 3;
   xmc[30] = sr & 0x7;  sr >>= 3;
@@ -790,7 +790,7 @@ void XA_MSGSM_Decoder(unsigned char *ibu
   xmc[38] = sr & 0x7;  sr >>= 3;
   sr = *ibuf++;
   Nc[3] = sr & 0x7f;  sr >>= 7;
-  sr |= (word)*ibuf++ << 1;		
+  sr |= (word)*ibuf++ << 1;
   bc[3] = sr & 0x3;  sr >>= 2;
   Mc[3] = sr & 0x3;  sr >>= 2;
   sr |= (word)*ibuf++ << 5;
@@ -816,7 +816,7 @@ void XA_MSGSM_Decoder(unsigned char *ibu
   GSM_Decode(&gsm_state, LARc, Nc, bc, Mc, xmaxc, xmc, &obuf[160]);
 
   /* Return number of source bytes consumed and output samples produced */
-//  *icnt = 65;		
+//  *icnt = 65;
 //  *ocnt = 320;
   return;
 }
@@ -824,7 +824,7 @@ void XA_MSGSM_Decoder(unsigned char *ibu
 #define GSM_MAGIC 0xd
 
 void XA_GSM_Decoder(unsigned char *ibuf,unsigned short *obuf)
-{ word  LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4];	
+{ word  LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4];
 
 	/* Sanity */
   if (((*ibuf >> 4) & 0x0F) != GSM_MAGIC)

Modified: trunk/libmpcodecs/native/xa_gsm_int.h
==============================================================================
--- trunk/libmpcodecs/native/xa_gsm_int.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/native/xa_gsm_int.h	Wed May 13 04:58:57 2009	(r29305)
@@ -76,10 +76,10 @@ typedef struct {
 
 
 /*
- *  Inlined functions from add.h 
+ *  Inlined functions from add.h
  */
 
-/* 
+/*
  * #define GSM_MULT_R(a, b) (* word a, word b, !(a == b == MIN_WORD) *)	\
  *	(0x0FFFF & SASR(((longword)(a) * (longword)(b) + 16384), 15))
  */

Modified: trunk/libmpcodecs/pullup.c
==============================================================================
--- trunk/libmpcodecs/pullup.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/pullup.c	Wed May 13 04:58:57 2009	(r29305)
@@ -18,9 +18,9 @@ static int diff_y_mmx(unsigned char *a, 
 		"movl $4, %%ecx \n\t"
 		"pxor %%mm4, %%mm4 \n\t"
 		"pxor %%mm7, %%mm7 \n\t"
-		
+
 		"1: \n\t"
-		
+
 		"movq (%%"REG_S"), %%mm0 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
 		"add  %%"REG_a", %%"REG_S" \n\t"
@@ -38,7 +38,7 @@ static int diff_y_mmx(unsigned char *a, 
 		"paddw %%mm1, %%mm4 \n\t"
 		"paddw %%mm2, %%mm4 \n\t"
 		"paddw %%mm3, %%mm4 \n\t"
-		
+
 		"decl %%ecx \n\t"
 		"jnz 1b \n\t"
 
@@ -66,7 +66,7 @@ static int licomb_y_mmx(unsigned char *a
 		"pxor %%mm6, %%mm6 \n\t"
 		"pxor %%mm7, %%mm7 \n\t"
 		"sub  %%"REG_a", %%"REG_D" \n\t"
-		
+
 		"2: \n\t"
 
 		"movq (%%"REG_D"), %%mm0 \n\t"
@@ -96,7 +96,7 @@ static int licomb_y_mmx(unsigned char *a
 		"psubusw %%mm2, %%mm1 \n\t"
 		"paddw %%mm0, %%mm6 \n\t"
 		"paddw %%mm1, %%mm6 \n\t"
-		
+
 		"movq (%%"REG_D",%%"REG_a"), %%mm0 \n\t"
 		"movq (%%"REG_S"), %%mm1 \n\t"
 		"punpcklbw %%mm7, %%mm0 \n\t"
@@ -110,7 +110,7 @@ static int licomb_y_mmx(unsigned char *a
 		"psubusw %%mm2, %%mm1 \n\t"
 		"paddw %%mm0, %%mm6 \n\t"
 		"paddw %%mm1, %%mm6 \n\t"
-		
+
 		"movq (%%"REG_D",%%"REG_a"), %%mm0 \n\t"
 		"movq (%%"REG_S"), %%mm1 \n\t"
 		"punpckhbw %%mm7, %%mm0 \n\t"
@@ -129,7 +129,7 @@ static int licomb_y_mmx(unsigned char *a
 		"add  %%"REG_a", %%"REG_D" \n\t"
 		"decl %%ecx \n\t"
 		"jnz 2b \n\t"
-		
+
 		"movq %%mm6, %%mm5 \n\t"
 		"punpcklwd %%mm7, %%mm6 \n\t"
 		"punpckhwd %%mm7, %%mm5 \n\t"
@@ -138,7 +138,7 @@ static int licomb_y_mmx(unsigned char *a
 		"psrlq $32, %%mm5 \n\t"
 		"movd %%mm5, %%edx \n\t"
 		"addl %%edx, %%eax \n\t"
-		
+
 		"emms \n\t"
 		: "=a" (ret)
 		: "S" (a), "D" (b), "a" (s)
@@ -154,9 +154,9 @@ static int var_y_mmx(unsigned char *a, u
 		"movl $3, %%ecx \n\t"
 		"pxor %%mm4, %%mm4 \n\t"
 		"pxor %%mm7, %%mm7 \n\t"
-		
+
 		"1: \n\t"
-		
+
 		"movq (%%"REG_S"), %%mm0 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
 		"movq (%%"REG_S",%%"REG_a"), %%mm1 \n\t"
@@ -173,7 +173,7 @@ static int var_y_mmx(unsigned char *a, u
 		"paddw %%mm1, %%mm4 \n\t"
 		"paddw %%mm2, %%mm4 \n\t"
 		"paddw %%mm3, %%mm4 \n\t"
-		
+
 		"decl %%ecx \n\t"
 		"jnz 1b \n\t"
 
@@ -297,7 +297,7 @@ struct pullup_buffer *pullup_get_buffer(
 		alloc_buffer(c, c->last->buffer);
 		return pullup_lock_buffer(c->last->buffer, parity);
 	}
-	
+
 	/* Prefer a buffer with both fields open */
 	for (i = 0; i < c->nbuffers; i++) {
 		if (c->buffers[i].lock[0]) continue;
@@ -307,7 +307,7 @@ struct pullup_buffer *pullup_get_buffer(
 	}
 
 	if (parity == 2) return 0;
-	
+
 	/* Search for any half-free buffer */
 	for (i = 0; i < c->nbuffers; i++) {
 		if (((parity+1) & 1) && c->buffers[i].lock[0]) continue;
@@ -315,7 +315,7 @@ struct pullup_buffer *pullup_get_buffer(
 		alloc_buffer(c, &c->buffers[i]);
 		return pullup_lock_buffer(&c->buffers[i], parity);
 	}
-	
+
 	return 0;
 }
 
@@ -399,10 +399,10 @@ static void check_field_queue(struct pul
 void pullup_submit_field(struct pullup_context *c, struct pullup_buffer *b, int parity)
 {
 	struct pullup_field *f;
-	
+
 	/* Grow the circular list if needed */
 	check_field_queue(c);
-	
+
 	/* Cannot have two fields of same parity in a row; drop the new one */
 	if (c->last && c->last->parity == parity) return;
 
@@ -426,7 +426,7 @@ void pullup_submit_field(struct pullup_c
 void pullup_flush_fields(struct pullup_context *c)
 {
 	struct pullup_field *f;
-	
+
 	for (f = c->first; f && f != c->head; f = f->next) {
 		pullup_release_buffer(f->buffer, f->parity);
 		f->buffer = 0;
@@ -455,7 +455,7 @@ static int queue_length(struct pullup_fi
 {
 	int count = 1;
 	struct pullup_field *f;
-	
+
 	if (!begin || !end) return 0;
 	for (f = begin; f != end; f = f->next) count++;
 	return count;
@@ -567,7 +567,7 @@ static int decide_frame_length(struct pu
 	struct pullup_field *f1 = f0->next;
 	struct pullup_field *f2 = f1->next;
 	int l;
-	
+
 	if (queue_length(c->first, c->last) < 4) return 0;
 	foo(c);
 
@@ -575,7 +575,7 @@ static int decide_frame_length(struct pu
 
 	l = find_first_break(f0, 3);
 	if (l == 1 && c->strict_breaks < 0) l = 0;
-	
+
 	switch (l) {
 	case 1:
 		if (c->strict_breaks < 1 && f0->affinity == 1 && f1->affinity == -1)
@@ -653,7 +653,7 @@ struct pullup_frame *pullup_get_frame(st
 		c->first->buffer = 0;
 		c->first = c->first->next;
 	}
-	
+
 	if (n == 1) {
 		fr->ofields[fr->parity] = fr->ifields[0];
 		fr->ofields[fr->parity^1] = 0;
@@ -669,7 +669,7 @@ struct pullup_frame *pullup_get_frame(st
 	}
 	pullup_lock_buffer(fr->ofields[0], 0);
 	pullup_lock_buffer(fr->ofields[1], 1);
-	
+
 	if (fr->ofields[0] == fr->ofields[1]) {
 		fr->buffer = fr->ofields[0];
 		pullup_lock_buffer(fr->buffer, 2);
@@ -756,7 +756,7 @@ void pullup_init_context(struct pullup_c
 	c->metric_h = (c->h[mp] - ((c->junk_top + c->junk_bottom) << 1)) >> 3;
 	c->metric_offset = c->junk_left*c->bpp[mp] + (c->junk_top<<1)*c->stride[mp];
 	c->metric_len = c->metric_w * c->metric_h;
-	
+
 	c->head = make_field_queue(c, 8);
 
 	c->frame = calloc(1, sizeof (struct pullup_frame));

Modified: trunk/libmpcodecs/vd.c
==============================================================================
--- trunk/libmpcodecs/vd.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd.c	Wed May 13 04:58:57 2009	(r29305)
@@ -115,11 +115,11 @@ float movie_aspect=-1.0;
 int vo_flags=0;
 int vd_use_slices=1;
 
-/** global variables for gamma, brightness, contrast, saturation and hue 
+/** global variables for gamma, brightness, contrast, saturation and hue
     modified by mplayer.c and gui/mplayer/gtk/eq.c:
     ranges -100 - 100
     1000 if the vo default should be used
-*/   
+*/
 int vo_gamma_gamma = 1000;
 int vo_gamma_brightness = 1000;
 int vo_gamma_contrast = 1000;
@@ -151,7 +151,7 @@ int mpcodecs_config_vo(sh_video_t *sh, i
     mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VoConfigRequest,w,h,vo_format_name(preferred_outfmt));
 
 //    if(!vf) return 1; // temp hack
-    
+
     if(get_video_quality_max(sh)<=0 && divx_quality){
 	// user wants postprocess but no pp filter yet:
 	sh->vfilter=vf=vf_open_filter(vf,"pp",NULL);
@@ -202,7 +202,7 @@ csp_again:
 	    palette=-1;
 	    vf=vf_open_filter(vf,"palette",NULL);
 	    goto csp_again;
-	} else 
+	} else
 	{ // sws failed, if the last filter (vf_vo) support MPEGPES try to append vf_lavc
 	     vf_instance_t* vo, *vp = NULL, *ve;
 	     // Remove the scale filter if we added it ourself

Modified: trunk/libmpcodecs/vd_dmo.c
==============================================================================
--- trunk/libmpcodecs/vd_dmo.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_dmo.c	Wed May 13 04:58:57 2009	(r29305)
@@ -65,16 +65,16 @@ static void uninit(sh_video_t *sh){
 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
     mp_image_t* mpi;
     if(len<=0) return NULL; // skipped frame
-    
+
     if(flags&3){
 	// framedrop:
         DMO_VideoDecoder_DecodeInternal(sh->context, data, len, 0, 0);
 	return NULL;
     }
-    
-    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/, 
+
+    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/,
 	sh->disp_w, sh->disp_h);
-    
+
     if(!mpi){	// temporary!
 	mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_MPCODECS_CouldntAllocateImageForCinepakCodec);
 	return NULL;

Modified: trunk/libmpcodecs/vd_dshow.c
==============================================================================
--- trunk/libmpcodecs/vd_dshow.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_dshow.c	Wed May 13 04:58:57 2009	(r29305)
@@ -94,16 +94,16 @@ static void uninit(sh_video_t *sh){
 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
     mp_image_t* mpi;
     if(len<=0) return NULL; // skipped frame
-    
+
     if(flags&3){
 	// framedrop:
         DS_VideoDecoder_DecodeInternal(sh->context, data, len, 0, 0);
 	return NULL;
     }
-    
-    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/, 
+
+    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/,
 	sh->disp_w, sh->disp_h);
-    
+
     if(!mpi){	// temporary!
 	mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_MPCODECS_CouldntAllocateImageForCinepakCodec);
 	return NULL;

Modified: trunk/libmpcodecs/vd_hmblck.c
==============================================================================
--- trunk/libmpcodecs/vd_hmblck.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_hmblck.c	Wed May 13 04:58:57 2009	(r29305)
@@ -90,7 +90,7 @@ static int nv12_to_yv12(unsigned char *d
 
     // chroma data is interlaced UVUV... so deinterlace it
     for(idx=0; idx<UV_size; idx++ ) {
-        *(dst_U + idx) = *(src + (idx<<1) + (swapped ? 1 : 0)); 
+        *(dst_U + idx) = *(src + (idx<<1) + (swapped ? 1 : 0));
         *(dst_V + idx) = *(src + (idx<<1) + (swapped ? 0 : 1));
     }
     return 1;

Modified: trunk/libmpcodecs/vd_libdv.c
==============================================================================
--- trunk/libmpcodecs/vd_libdv.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_libdv.c	Wed May 13 04:58:57 2009	(r29305)
@@ -62,7 +62,7 @@ static mp_image_t* decode(sh_video_t *sh
 {
    mp_image_t* mpi;
    dv_decoder_t *decoder=sh->context;
-   
+
    if(len<=0 || (flags&3)){
 //      fprintf(stderr,"decode() (rawdv) SKIPPED\n");
       return NULL; // skipped frame
@@ -71,13 +71,13 @@ static mp_image_t* decode(sh_video_t *sh
    dv_parse_header(decoder, data);
 
    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, sh->disp_w, sh->disp_h);
-    
+
    if(!mpi){	// temporary!
       fprintf(stderr,"couldn't allocate image for stderr codec\n");
       return NULL;
    }
 
    dv_decode_full_frame(decoder, data, e_dv_color_yuv, mpi->planes, mpi->stride);
-   
+
    return mpi;
 }

Modified: trunk/libmpcodecs/vd_libmpeg2.c
==============================================================================
--- trunk/libmpcodecs/vd_libmpeg2.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_libmpeg2.c	Wed May 13 04:58:57 2009	(r29305)
@@ -9,7 +9,7 @@
 
 //#undef MPEG12_POSTPROC
 
-static vd_info_t info = 
+static vd_info_t info =
 {
 	"libmpeg2 MPEG 1/2 Video decoder",
 	"libmpeg2",
@@ -56,7 +56,7 @@ static int control(sh_video_t *sh,int cm
 	    return CONTROL_TRUE;
 	return CONTROL_FALSE;
     }
-    
+
     return CONTROL_UNKNOWN;
 }
 
@@ -120,7 +120,7 @@ static void uninit(sh_video_t *sh){
     free(sh->context);
 }
 
-static void draw_slice (void * _sh, uint8_t * const * src, unsigned int y){ 
+static void draw_slice (void * _sh, uint8_t * const * src, unsigned int y){
     sh_video_t* sh = (sh_video_t*) _sh;
     vd_libmpeg2_ctx_t *context = sh->context;
     mpeg2dec_t* mpeg2dec = context->mpeg2dec;
@@ -147,9 +147,9 @@ static mp_image_t* decode(sh_video_t *sh
     // MPlayer registers its own draw_slice callback, prevent libmpeg2 from freeing the context
     mpeg2dec->decoder.convert=NULL;
     mpeg2dec->decoder.convert_id=NULL;
-    
+
     if(len<=0) return NULL; // skipped null frame
-    
+
     // append extra 'end of frame' code:
     ((char*)data+len)[0]=0;
     ((char*)data+len)[1]=0;
@@ -162,14 +162,14 @@ static mp_image_t* decode(sh_video_t *sh
     } else {
         mpeg2_buffer (mpeg2dec, data, (uint8_t *)data+len);
     }
-    
+
     while(1){
 	int state=mpeg2_parse (mpeg2dec);
 	int type, use_callback;
 	mp_image_t* mpi_new;
 	unsigned long pw, ph;
 	int imgfmt;
-	
+
 	switch(state){
 	case STATE_BUFFER:
 	    if (mpeg2dec->pending_length) {
@@ -209,7 +209,7 @@ static mp_image_t* decode(sh_video_t *sh
 	    break;
 	case STATE_PICTURE:
 	    type=info->current_picture->flags&PIC_MASK_CODING_TYPE;
-	    
+
 	    drop_frame = framedrop && (mpeg2dec->decoder.coding_type == B_TYPE);
             drop_frame |= framedrop>=2; // hard drop
             if (drop_frame) {
@@ -268,7 +268,7 @@ static mp_image_t* decode(sh_video_t *sh
 	        mpeg2dec->decoder.convert=NULL;
 	        mpeg2dec->decoder.convert_id=NULL;
 	    }
-	    
+
 	    break;
 	case STATE_SLICE:
 	case STATE_END:

Modified: trunk/libmpcodecs/vd_lzo.c
==============================================================================
--- trunk/libmpcodecs/vd_lzo.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_lzo.c	Wed May 13 04:58:57 2009	(r29305)
@@ -45,7 +45,7 @@ static int init(sh_video_t *sh)
 
     if (sh->bih->biSizeImage <= 0) {
 	mp_msg (MSGT_DECVIDEO, MSGL_ERR, "[%s] Invalid frame size\n", MOD_NAME);
-	return 0; 
+	return 0;
     }
 
     priv = malloc(sizeof(lzo_context_t));
@@ -66,7 +66,7 @@ static int init(sh_video_t *sh)
 static void uninit(sh_video_t *sh)
 {
     lzo_context_t *priv = sh->context;
-    
+
     if (priv)
     {
 	free(priv->buffer);
@@ -87,11 +87,11 @@ static mp_image_t* decode(sh_video_t *sh
     if (len <= 0) {
 	    return NULL; // skipped frame
     }
-    
+
     r = av_lzo1x_decode(priv->buffer, &w, data, &len);
     if (r) {
 	/* this should NEVER happen */
-	mp_msg (MSGT_DECVIDEO, MSGL_ERR, 
+	mp_msg (MSGT_DECVIDEO, MSGL_ERR,
 		"[%s] internal error - decompression failed: %d\n", MOD_NAME, r);
       return NULL;
     }
@@ -140,7 +140,7 @@ static mp_image_t* decode(sh_video_t *sh
         mpi->stride[1] = sh->disp_w / 2;
     }
 
-    mp_msg (MSGT_DECVIDEO, MSGL_DBG2, 
+    mp_msg (MSGT_DECVIDEO, MSGL_DBG2,
 		"[%s] decompressed %lu bytes into %lu bytes\n", MOD_NAME,
 		(long) len, (long)w);
 

Modified: trunk/libmpcodecs/vd_mpegpes.c
==============================================================================
--- trunk/libmpcodecs/vd_mpegpes.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_mpegpes.c	Wed May 13 04:58:57 2009	(r29305)
@@ -7,7 +7,7 @@
 
 #include "vd_internal.h"
 
-static vd_info_t info = 
+static vd_info_t info =
 {
 	"MPEG 1/2 Video passthrough",
 	"mpegpes",
@@ -55,7 +55,7 @@ static mp_image_t* decode(sh_video_t *sh
                 return 0;
         }
     }
-    
+
     mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, sh->disp_w, sh->disp_h);
     packet.data=data;
     packet.size=len;

Modified: trunk/libmpcodecs/vd_mpng.c
==============================================================================
--- trunk/libmpcodecs/vd_mpng.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_mpng.c	Wed May 13 04:58:57 2009	(r29305)
@@ -79,7 +79,7 @@ static mp_image_t* decode(sh_video_t *sh
     unsigned char *p;
 
     if(len<=0) return NULL; // skipped frame
-    
+
  png=png_create_read_struct( PNG_LIBPNG_VER_STRING,NULL,NULL,NULL );
  info=png_create_info_struct( png );
  endinfo=png_create_info_struct( png );
@@ -131,13 +131,13 @@ static mp_image_t* decode(sh_video_t *sh
   }
 #endif
 
-    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, 
+    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
 	png_width,png_height);
     if(!mpi) return NULL;
 
 // Let's DECODE!
  row_p=malloc( sizeof( png_bytep ) * png_height );
-//png_get_rowbytes( png,info ) 
+//png_get_rowbytes( png,info )
  for ( i=0; i < png_height; i++ ) row_p[i]=mpi->planes[0] + mpi->stride[0]*i;
  png_read_image( png,row_p );
  free( row_p );
@@ -153,7 +153,7 @@ static mp_image_t* decode(sh_video_t *sh
 	 *p++ = 0;
      }
  }
- 
+
  png_read_end( png,endinfo );
  png_destroy_read_struct( &png,&info,&endinfo );
 

Modified: trunk/libmpcodecs/vd_mtga.c
==============================================================================
--- trunk/libmpcodecs/vd_mtga.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_mtga.c	Wed May 13 04:58:57 2009	(r29305)
@@ -42,10 +42,10 @@ typedef struct
 {
     unsigned char   id_len;
     unsigned short  img_type;
-		
+
     unsigned short  width;
     unsigned short  height;
-		
+
     unsigned char   bpp;
     unsigned char   origin; /* 0 = lower left, 1 = upper left */
     unsigned short  start_row;
@@ -100,17 +100,17 @@ static void decode_rle_tga(TGAInfo *info
     for (row = info->start_row; (!info->origin && row) || (info->origin && row < info->height); row += info->increment)
     {
 	final = mpi->planes[0] + mpi->stride[0] * row;
-	
+
 	for (col = 0; col < info->width; col += repetitions)
 	{
 	    packet_header = *data++;
 	    repetitions = (1 + (packet_header & 0x7f));
 	    replen = repetitions * num_bytes;
-	    
+
 	    if (packet_header & 0x80) /* runlength encoded packet */
 	    {
 		memcpy(final, data, num_bytes);
-		
+
 		// Note: this will be slow when DR to vram!
 		i=num_bytes;
 		while(2*i<=replen){
@@ -125,11 +125,11 @@ static void decode_rle_tga(TGAInfo *info
 		fast_memcpy(final, data, replen);
 		data += replen;
 	    }
-	    
+
 	    final += replen;
 	}
     }
-    
+
     return;
 }
 
@@ -138,7 +138,7 @@ static void decode_uncompressed_tga(TGAI
 {
     unsigned char   *final;
     int	    row, num_bytes = info->bpp / 8;
-   
+
     /* see line 207 to see why this loop is set up like this */
     for (row = info->start_row; (!info->origin && row) || (info->origin && row < info->height); row += info->increment)
     {
@@ -154,7 +154,7 @@ static void decode_uncompressed_tga(TGAI
 static short read_tga_header(unsigned char *buf, TGAInfo *info)
 {
     info->id_len = buf[0];
-    
+
     info->img_type = buf[2];
 
     /* targa data is always stored in little endian byte order */
@@ -162,11 +162,11 @@ static short read_tga_header(unsigned ch
     info->height = le2me_16(*(unsigned short *) &buf[14]);
 
     info->bpp = buf[16];
-    
+
     info->origin = (buf[17] & 0x20) >> 5;
 
     /* FIXME check for valid targa data */
-    
+
     return 0;
 }
 
@@ -177,13 +177,13 @@ static mp_image_t *decode(sh_video_t *sh
     TGAInfo	    *info = sh->context;
     unsigned char   *data = raw;
     mp_image_t	    *mpi;
-    
-    
+
+
     if (len <= 0)
 	return NULL; /* skip frame */
 
     read_tga_header(data, info); /* read information about the file */
-    
+
     if (info->bpp == 24)
 	out_fmt = IMGFMT_BGR24;
     else if (info->bpp == 32)
@@ -193,7 +193,7 @@ static mp_image_t *decode(sh_video_t *sh
 	mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Unsupported TGA type! depth=%d\n",info->bpp);
 	return NULL;
     }
-    
+
     if (info->img_type != TGA_UNCOMP_TRUECOLOR && info->img_type != TGA_RLE_TRUECOLOR) /* not a true color image */
     {
 	mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Unsupported TGA type: %i!\n", info->img_type);
@@ -206,21 +206,21 @@ static mp_image_t *decode(sh_video_t *sh
 
     /* set data to the beginning of the image data */
     data += 18 + info->id_len;
-  
+
     /* (re)init libvo if image parameters changed (width/height/colorspace) */
     if (last_w != info->width || last_h != info->height || last_c != out_fmt)
     {
 	last_w = info->width;
 	last_h = info->height;
 	last_c = out_fmt;
-	
+
 	if (!out_fmt || !mpcodecs_config_vo(sh, info->width, info->height, out_fmt))
 	    return NULL;
     }
 
     if (!(mpi = mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, info->width, info->height)))
 	return NULL;
-  
+
     /* finally decode the image */
     if (info->img_type == TGA_UNCOMP_TRUECOLOR)
 	decode_uncompressed_tga(info, data, mpi);

Modified: trunk/libmpcodecs/vd_null.c
==============================================================================
--- trunk/libmpcodecs/vd_null.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_null.c	Wed May 13 04:58:57 2009	(r29305)
@@ -6,7 +6,7 @@
 
 #include "vd_internal.h"
 
-static vd_info_t info = 
+static vd_info_t info =
 {
 	"Null video decoder",
 	"null",

Modified: trunk/libmpcodecs/vd_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/vd_qtvideo.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_qtvideo.c	Wed May 13 04:58:57 2009	(r29305)
@@ -30,7 +30,7 @@ LIBVD_EXTERN(qtvideo)
 static ComponentInstance ci=NULL; // codec handle
 //static CodecInfo cinfo;	// for ImageCodecGetCodecInfo()
 //Component prev=NULL;
-//ComponentResult cres; // 
+//ComponentResult cres; //
 static CodecCapabilities codeccap; // for decpar
 static CodecDecompressParams decpar; // for ImageCodecPreDecompress()
 //static ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
@@ -63,7 +63,7 @@ static    ComponentResult (*ImageCodecPr
                                  CodecDecompressParams * params);
 static    ComponentResult (*ImageCodecBandDecompress)(ComponentInstance      ci,
                                  CodecDecompressParams * params);
-static    PixMapHandle    (*GetGWorldPixMap)(GWorldPtr offscreenGWorld);                  
+static    PixMapHandle    (*GetGWorldPixMap)(GWorldPtr offscreenGWorld);
 static    OSErr           (*QTNewGWorldFromPtr)(GWorldPtr *gw,
 			       OSType pixelFormat,
 			       const Rect *boundsRect,
@@ -71,8 +71,8 @@ static    OSErr           (*QTNewGWorldF
                                /*GDHandle*/void* aGDevice, //unused anyway
                                GWorldFlags flags,
                                void *baseAddr,
-                               long rowBytes); 
-static    OSErr           (*NewHandleClear)(Size byteCount);                          
+                               long rowBytes);
+static    OSErr           (*NewHandleClear)(Size byteCount);
 #endif /* #ifndef CONFIG_QUICKTIME */
 
 // to set/get/query special features/parameters
@@ -108,7 +108,7 @@ static int init(sh_video_t *sh){
     mp_msg(MSGT_DECVIDEO,MSGL_ERR,"unable to load QuickTime.qts\n" );
     return 0;
     }
-    
+
     handler = LoadLibraryA("qtmlClient.dll");
     if(!handler){
     mp_msg(MSGT_DECVIDEO,MSGL_ERR,"unable to load qtmlClient.dll\n");
@@ -130,7 +130,7 @@ static int init(sh_video_t *sh){
     QTNewGWorldFromPtr = (OSErr(*)(GWorldPtr *,OSType,const Rect *,CTabHandle,void*,GWorldFlags,void *,long))GetProcAddress(handler, "QTNewGWorldFromPtr");
     NewHandleClear = (OSErr(*)(Size))GetProcAddress(handler, "NewHandleClear");
     //     = GetProcAddress(handler, "");
-    
+
     if(!InitializeQTML || !EnterMovies || !FindNextComponent || !ImageCodecBandDecompress){
 	mp_msg(MSGT_DECVIDEO,MSGL_ERR,"invalid qtmlClient.dll!\n");
 	return 0;
@@ -167,7 +167,7 @@ static int init(sh_video_t *sh){
 			(((unsigned char)'d')<<8)|
 			(((unsigned char)'c'));
 #if 0
-    desc.componentSubType= 
+    desc.componentSubType=
 		    (((unsigned char)'S'<<24))|
 			(((unsigned char)'V')<<16)|
 			(((unsigned char)'Q')<<8)|
@@ -193,7 +193,7 @@ static int init(sh_video_t *sh){
     memset(&icap,0,sizeof(icap));
     cres=ImageCodecInitialize(ci,&icap);
     mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ImageCodecInitialize->%#x  size=%d (%d)\n",cres,icap.recordSize,icap.decompressRecordSize);
-    
+
     memset(&cinfo,0,sizeof(cinfo));
     cres=ImageCodecGetCodecInfo(ci,&cinfo);
     mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"Flags: compr: 0x%X  decomp: 0x%X format: 0x%X\n",
@@ -225,7 +225,7 @@ static int init(sh_video_t *sh){
     dump_ImageDescription(*framedescHandle);
 #endif
 //Find codecscomponent for video decompression
-//    result = FindCodec ('SVQ1',anyCodec,&compressor,&decompressor );                 
+//    result = FindCodec ('SVQ1',anyCodec,&compressor,&decompressor );
 //    printf("FindCodec SVQ1 returned:%i compressor: 0x%X decompressor: 0x%X\n",result,compressor,decompressor);
 
     sh->context = (void *)kYUVSPixelFormat;
@@ -291,10 +291,10 @@ static mp_image_t* decode(sh_video_t *sh
     int i;
     mp_image_t* mpi;
     ComponentResult cres;
-    
+
     if(len<=0) return NULL; // skipped frame
 
-    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_STATIC, MP_IMGFLAG_PRESERVE, 
+    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_STATIC, MP_IMGFLAG_PRESERVE,
 	sh->disp_w, sh->disp_h);
     if(!mpi) return NULL;
 
@@ -304,13 +304,13 @@ static mp_image_t* decode(sh_video_t *sh
 
 if(!codec_initialized){
     result = QTNewGWorldFromPtr(
-        &OutBufferGWorld,  
+        &OutBufferGWorld,
 //        kYUVSPixelFormat, //pixel format of new GWorld == YUY2
 	(OSType)sh->context,
         &OutBufferRect,   //we should benchmark if yvu9 is faster for svq3, too
-        0, 
-        0, 
-        0, 
+        0,
+        0,
+        0,
         mpi->planes[0],
         mpi->stride[0]);
     mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"NewGWorldFromPtr returned:%ld\n",65536-(result&0xffff));
@@ -333,7 +333,7 @@ if(!codec_initialized){
     decpar.accuracy = codecNormalQuality;
 //    decpar.port = OutBufferGWorld;
 //    decpar.preferredOffscreenPixelSize=17207;
-    
+
 //    decpar.sequenceID=malloc(1000);
 //    memset(decpar.sequenceID,0,1000);
 
@@ -344,13 +344,13 @@ if(!codec_initialized){
 
 //    decpar.srcRect = SrcRect;
     decpar.srcRect = OutBufferRect;
-    
+
     decpar.transferMode = srcCopy;
-    decpar.dstPixMap = **GetGWorldPixMap( OutBufferGWorld);//destPixmap; 
-  
+    decpar.dstPixMap = **GetGWorldPixMap( OutBufferGWorld);//destPixmap;
+
     cres=ImageCodecPreDecompress(ci,&decpar);
     mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ImageCodecPreDecompress cres=0x%X\n",cres);
-    
+
     if(decpar.wantedDestinationPixelTypes)
     { OSType *p=*(decpar.wantedDestinationPixelTypes);
       if(p) while(*p){
@@ -358,7 +358,7 @@ if(!codec_initialized){
 	  ++p;
       }
     }
-    
+
 
 //    decpar.conditionFlags=0x10FFF; // first
 //    decpar.preferredOffscreenPixelSize=17207;
@@ -388,7 +388,7 @@ if(!codec_initialized){
 	mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"ImageCodecBandDecompress cres=0x%X (-0x%X) %d\n",cres,-cres,cres);
 	return NULL;
     }
-    
+
 //    for(i=0;i<8;i++)
 //	printf("img_base[%d]=%p\n",i,((int*)decpar.dstPixMap.baseAddr)[i]);
 
@@ -418,7 +418,7 @@ if((int)sh->context==0x73797639){	// Sor
 	for(x=0;x<mpi->w/4;x++) dst[x]=src[x];
 	src+=((mpi->w+63)&(~63))/4;
     }
-    
+
 }
 
 

Modified: trunk/libmpcodecs/vd_raw.c
==============================================================================
--- trunk/libmpcodecs/vd_raw.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_raw.c	Wed May 13 04:58:57 2009	(r29305)
@@ -59,10 +59,10 @@ static mp_image_t* decode(sh_video_t *sh
     mp_image_t* mpi;
     int frame_size;
     int format = sh->bih ? sh->bih->biCompression : sh->format;
-    
+
     if(len<=0) return NULL; // skipped frame
 
-    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, 
+    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0,
 	sh->disp_w, sh->disp_h);
     if(!mpi) return NULL;
 
@@ -119,6 +119,6 @@ static mp_image_t* decode(sh_video_t *sh
 	    len,frame_size);
 	return NULL;
     }
-    
+
     return mpi;
 }

Modified: trunk/libmpcodecs/vd_realvid.c
==============================================================================
--- trunk/libmpcodecs/vd_realvid.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_realvid.c	Wed May 13 04:58:57 2009	(r29305)
@@ -123,7 +123,7 @@ static int load_syms_linux(char *path) {
 	rv_handle = handle;
 	return 1;
     }
-	
+
 		rvyuv_custom_message = dlsym(handle, "RV40toYUV420CustomMessage");
 		rvyuv_free = dlsym(handle, "RV40toYUV420Free");
 		rvyuv_init = dlsym(handle, "RV40toYUV420Init");
@@ -281,7 +281,7 @@ static int init(sh_video_t *sh){
 
 	/* first try to load linux dlls, if failed and we're supporting win32 dlls,
 	   then try to load the windows ones */
-#ifdef HAVE_LIBDL       
+#ifdef HAVE_LIBDL
 	if(strstr(sh->codec->dll,".dll") || !load_syms_linux(path))
 #endif
 #ifdef CONFIG_WIN32DLL
@@ -393,7 +393,7 @@ static mp_image_t* decode(sh_video_t *sh
 	    buffer=malloc(bufsz);
 	    if (!buffer) return 0;
 	}
-	
+
 	for (i=0; i<2*(chunks+1); i++)
 		extra[i] = le2me_32(extra[i]);
 
@@ -412,7 +412,7 @@ static mp_image_t* decode(sh_video_t *sh
 	    sh->disp_h=transform_out[4];
 	    if (!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_I420)) return 0;
 	    initialized=1;
-	} 
+	}
 	    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/,
 		    sh->disp_w, sh->disp_h);
 	    if(!mpi) return NULL;
@@ -426,6 +426,6 @@ static mp_image_t* decode(sh_video_t *sh
 	if(transform_out[0] &&
 	   (sh->disp_w != transform_out[3] || sh->disp_h != transform_out[4]))
 	    initialized = 0;
-	
+
 	return result ? NULL : mpi;
 }

Modified: trunk/libmpcodecs/vd_sgi.c
==============================================================================
--- trunk/libmpcodecs/vd_sgi.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_sgi.c	Wed May 13 04:58:57 2009	(r29305)
@@ -51,7 +51,7 @@ static unsigned short last_y = -1;
 /* to set/get/query special features/parameters */
 static int
 control(sh_video_t* sh, int cmd, void *arg, ...)
-{ 
+{
   switch (cmd)
   {
     case VDCTRL_QUERY_FORMAT:
@@ -90,10 +90,10 @@ expandrow(unsigned char *optr, unsigned 
 {
   unsigned char pixel, count;
   optr += chan_offset;
-  
+
   while (1) {
     pixel = *iptr++;
-    
+
     if (!(count = (pixel & 0x7f))) {
       return;
     }
@@ -105,7 +105,7 @@ expandrow(unsigned char *optr, unsigned 
       }
     } else {
       pixel = *iptr++;
-      
+
       while (count--) {
         *optr = pixel;
         optr += OUT_PIXEL_STRIDE;
@@ -116,16 +116,16 @@ expandrow(unsigned char *optr, unsigned 
 
 
 /* expand an rle row into all 3 channels.
-   a separate function for grayscale so we don't slow down the 
+   a separate function for grayscale so we don't slow down the
    more common case rgb function with a bunch of ifs. */
 static void
 expandrow_gs(unsigned char *optr, unsigned char *iptr)
 {
   unsigned char pixel, count;
-  
+
   while (1) {
     pixel = *iptr++;
-    
+
     if (!(count = (pixel & 0x7f))) {
       return;
     }
@@ -139,7 +139,7 @@ expandrow_gs(unsigned char *optr, unsign
       }
     } else {
       pixel = *iptr++;
-      
+
       while (count--) {
         optr[0] = pixel;
         optr[1] = pixel;
@@ -159,29 +159,29 @@ decode_rle_sgi(SGIInfo *info, unsigned c
   uint32_t *starttab;
   int y, z, xsize, ysize, zsize, chan_offset;
   long start_offset;
-  
+
   xsize = info->xsize;
   ysize = info->ysize;
   zsize = info->zsize;
 
   /* rle offset table is right after the header */
-  starttab = (uint32_t*)(data + SGI_HEADER_LEN); 
-  
+  starttab = (uint32_t*)(data + SGI_HEADER_LEN);
+
    for (z = 0; z < zsize; z++) {
 
      /* set chan_offset so RGB ends up BGR */
      chan_offset = (zsize - 1) - z;
-     
+
      /* The origin for SGI images is the lower-left corner
         so read scan lines from bottom to top */
      for (y = ysize - 1; y >= 0; y--) {
        dest_row = mpi->planes[0] + mpi->stride[0] * (ysize - 1 - y);
-    
+
       /* set start of next run (offsets are from start of header) */
       start_offset = be2me_32(*(uint32_t*) &starttab[y + z * ysize]);
-      
+
       rle_data = &data[start_offset];
-    
+
       if(info->zsize == SGI_GRAYSCALE_IMAGE) {
         expandrow_gs(dest_row, rle_data);
       } else {
@@ -191,21 +191,21 @@ decode_rle_sgi(SGIInfo *info, unsigned c
   }
 }
 
-  
+
 /* decode an sgi image */
 static void
 decode_uncompressed_sgi(SGIInfo *info, unsigned char *data, mp_image_t *mpi)
 {
   unsigned char *src_row, *dest_row;
   int x, y, z, xsize, ysize, zsize, chan_offset;
-  
+
   xsize = info->xsize;
   ysize = info->ysize;
   zsize = info->zsize;
-  
-  /* skip header */ 
+
+  /* skip header */
   data += SGI_HEADER_LEN;
-  
+
   for (z = 0; z < zsize; z++) {
 
     /* set row ptr to start of current plane */
@@ -213,13 +213,13 @@ decode_uncompressed_sgi(SGIInfo *info, u
 
     /* set chan_offset for RGB -> BGR */
     chan_offset = (zsize - 1) - z;
-    
-    /* the origin for SGI images is the lower-left corner  
+
+    /* the origin for SGI images is the lower-left corner
        so read scan lines from bottom to top. */
     for (y = ysize - 1; y >= 0; y--) {
       dest_row = mpi->planes[0] + mpi->stride[0] * y;
       for (x = 0; x < xsize; x++) {
-        
+
         /* we only do 24 bit output so promote 8 bit pixels to 24 */
         if (zsize == SGI_GRAYSCALE_IMAGE) {
           /* write greyscale value into all channels */
@@ -229,7 +229,7 @@ decode_uncompressed_sgi(SGIInfo *info, u
         } else {
           dest_row[chan_offset] = src_row[x];
         }
-        
+
         dest_row += OUT_PIXEL_STRIDE;
       }
 
@@ -245,13 +245,13 @@ static void
 read_sgi_header(unsigned char *buf, SGIInfo *info)
 {
   /* sgi data is always stored in big endian byte order */
-  info->magic = be2me_16(*(unsigned short *) &buf[0]);     
+  info->magic = be2me_16(*(unsigned short *) &buf[0]);
   info->rle = buf[2];
   info->bytes_per_channel = buf[3];
-  info->dimension = be2me_16(*(unsigned short *) &buf[4]);     
-  info->xsize = be2me_16(*(unsigned short *) &buf[6]);     
-  info->ysize = be2me_16(*(unsigned short *) &buf[8]);     
-  info->zsize = be2me_16(*(unsigned short *) &buf[10]);     
+  info->dimension = be2me_16(*(unsigned short *) &buf[4]);
+  info->xsize = be2me_16(*(unsigned short *) &buf[6]);
+  info->ysize = be2me_16(*(unsigned short *) &buf[8]);
+  info->zsize = be2me_16(*(unsigned short *) &buf[10]);
 }
 
 
@@ -266,9 +266,9 @@ mp_image_t *decode(sh_video_t *sh, void 
   if (len <= 0) {
     return NULL; /* skip frame */
   }
-    
-  read_sgi_header(data, info); 
-  
+
+  read_sgi_header(data, info);
+
   /* make sure this is an SGI image file */
   if (info->magic != SGI_MAGIC) {
     mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Bad magic number in image.\n");
@@ -277,19 +277,19 @@ mp_image_t *decode(sh_video_t *sh, void 
 
   /* check image depth */
   if (info->bytes_per_channel != 1) {
-    mp_msg(MSGT_DECVIDEO, MSGL_INFO, 
+    mp_msg(MSGT_DECVIDEO, MSGL_INFO,
         "Unsupported bytes per channel value %i.\n", info->bytes_per_channel);
     return NULL;
   }
 
   /* check image dimension */
   if (info->dimension != 2 && info->dimension != 3) {
-    mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Unsupported image dimension %i.\n", 
+    mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Unsupported image dimension %i.\n",
         info->dimension);
     return NULL;
   }
 
-  /* change rgba images to rgb so alpha channel will be ignored */ 
+  /* change rgba images to rgb so alpha channel will be ignored */
   if (info->zsize == SGI_RGBA_IMAGE) {
     info->zsize = SGI_RGB_IMAGE;
   }
@@ -299,30 +299,30 @@ mp_image_t *decode(sh_video_t *sh, void 
     mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Unsupported image depth.\n");
     return NULL;
   }
-  
+
   /* (re)init libvo if image size is changed */
   if (last_x != info->xsize || last_y != info->ysize)
   {
     last_x = info->xsize;
     last_y = info->ysize;
-    
+
     if (!mpcodecs_config_vo(sh, info->xsize, info->ysize, outfmt)) {
       mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Config vo failed:\n");
       return NULL;
     }
   }
-   
-  if (!(mpi = mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, 
+
+  if (!(mpi = mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
           info->xsize, info->ysize))) {
     return NULL;
   }
- 
+
   if (info->rle) {
     decode_rle_sgi(info, data, mpi);
   } else {
     decode_uncompressed_sgi(info, data, mpi);
   }
-  
+
   return mpi;
 }
 

Modified: trunk/libmpcodecs/vd_theora.c
==============================================================================
--- trunk/libmpcodecs/vd_theora.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_theora.c	Wed May 13 04:58:57 2009	(r29305)
@@ -31,7 +31,7 @@ static int control(sh_video_t *sh,int cm
 	    return CONTROL_TRUE;
 	return CONTROL_FALSE;
     }
-    
+
     return CONTROL_UNKNOWN;
 }
 
@@ -55,7 +55,7 @@ static int init(sh_video_t *sh){
     switch(sh->codec->outfmt[sh->outfmtidx])
     {
        case IMGFMT_YV12: /* well, this should work... */ break;
-       default: 
+       default:
 	  mp_msg (MSGT_DECVIDEO,MSGL_ERR,"Unsupported out_fmt: 0x%X\n",
 		  sh->codec->outfmt[sh->outfmtidx]);
 	  return 0;
@@ -71,7 +71,7 @@ static int init(sh_video_t *sh){
 
        theora_info_init(&context->inf);
        theora_comment_init(&context->cc);
-       
+
        /* Read all header packets, pass them to theora_decode_header. */
        for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++)
        {
@@ -112,13 +112,13 @@ static int init(sh_video_t *sh){
        sh->aspect = (float)(context->inf.aspect_numerator * context->inf.frame_width)/
           (context->inf.aspect_denominator * context->inf.frame_height);
     }
-    
+
     mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Theora video init ok!\n");
 
     return mpcodecs_config_vo (sh,context->inf.frame_width,context->inf.frame_height,IMGFMT_YV12);
 }
 
-/* 
+/*
  * uninit driver
  */
 static void uninit(sh_video_t *sh)
@@ -137,7 +137,7 @@ static void uninit(sh_video_t *sh)
 /*
  * decode frame
  */
-static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) 
+static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags)
 {
    theora_struct_t *context = (theora_struct_t *)sh->context;
    int errorCode = 0;
@@ -175,6 +175,6 @@ static mp_image_t* decode(sh_video_t *sh
     mpi->stride[1]=yuv.uv_stride;
     mpi->planes[2]=yuv.v;
     mpi->stride[2]=yuv.uv_stride;
-   
+
     return mpi;
 }

Modified: trunk/libmpcodecs/vd_vfw.c
==============================================================================
--- trunk/libmpcodecs/vd_vfw.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_vfw.c	Wed May 13 04:58:57 2009	(r29305)
@@ -142,7 +142,7 @@ static int init(sh_video_t *sh){
 //    unsigned int outfmt=sh->codec->outfmt[sh->outfmtidx];
     int i, o_bih_len;
     vd_vfw_ctx *priv;
-  
+
     /* Hack for VSSH codec: new dll can't decode old files
      * In my samples old files have no extradata, so use that info
      * to decide what dll should be used (here and in vd_dshow).
@@ -171,7 +171,7 @@ static int init(sh_video_t *sh){
 //    sh->bih->biBitCount=32;
 
     o_bih_len = ICDecompressGetFormatSize(priv->handle, sh->bih);
-  
+
     if(o_bih_len < sizeof(BITMAPINFOHEADER)){
        mp_msg(MSGT_WIN32,MSGL_ERR,"ICDecompressGetFormatSize returned a bogus value: %d\n", o_bih_len);
        return 0;
@@ -268,7 +268,7 @@ static int init(sh_video_t *sh){
 static void uninit(sh_video_t *sh){
     HRESULT ret;
     vd_vfw_ctx *priv = sh->context;
-    
+
 #ifdef BUILD_VFWEX
     ret = ICDecompressEndEx(priv->handle);
 #else
@@ -286,7 +286,7 @@ static void uninit(sh_video_t *sh){
 	mp_msg(MSGT_WIN32, MSGL_WARN, "ICClose failed: %ld\n", ret);
 	return;
     }
-    
+
     free(priv->o_bih);
     free(priv);
 }
@@ -299,9 +299,9 @@ static mp_image_t* decode(sh_video_t *sh
 
     if(len<=0) return NULL; // skipped frame
 
-    mpi=mpcodecs_get_image(sh, 
+    mpi=mpcodecs_get_image(sh,
 	(sh->codec->outflags[sh->outfmtidx] & CODECS_FLAG_STATIC) ?
-	MP_IMGTYPE_STATIC : MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_WIDTH, 
+	MP_IMGTYPE_STATIC : MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_WIDTH,
 	sh->disp_w, sh->disp_h);
     if(!mpi){	// temporary!
 	mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_MPCODECS_CouldntAllocateImageForCinepakCodec);
@@ -315,9 +315,9 @@ static mp_image_t* decode(sh_video_t *sh
     sh->bih->biSizeImage = len;
 
 #ifdef BUILD_VFWEX
-    ret = ICDecompressEx(priv->handle, 
+    ret = ICDecompressEx(priv->handle,
 #else
-    ret = ICDecompress(priv->handle, 
+    ret = ICDecompress(priv->handle,
 #endif
 	  ( (sh->ds->flags&1) ? 0 : ICDECOMPRESS_NOTKEYFRAME ) |
 	  ( ((flags&3)==2 && !(sh->ds->flags&1))?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ),
@@ -327,7 +327,7 @@ static mp_image_t* decode(sh_video_t *sh
       mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error decompressing frame, err=%ld\n",ret);
       return NULL;
     }
-    
+
     // export palette:
     if(mpi->imgfmt==IMGFMT_RGB8 || mpi->imgfmt==IMGFMT_BGR8){
 	if (priv->palette)
@@ -339,6 +339,6 @@ static mp_image_t* decode(sh_video_t *sh
 	else
 	    mpi->planes[1]=NULL;
     }
-        
+
     return mpi;
 }

Modified: trunk/libmpcodecs/vd_xanim.c
==============================================================================
--- trunk/libmpcodecs/vd_xanim.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_xanim.c	Wed May 13 04:58:57 2009	(r29305)
@@ -221,7 +221,7 @@ static int xacodec_load(sh_video_t *sh, 
 	dlclose(priv->file_handler);
 	return 0;
     }
-	
+
     mod_hdr = what_the();
     if (!mod_hdr)
     {
@@ -229,7 +229,7 @@ static int xacodec_load(sh_video_t *sh, 
 	dlclose(priv->file_handler);
 	return 0;
     }
-    
+
     mp_msg(MSGT_DECVIDEO, MSGL_V, "=== XAnim Codec ===\n");
     mp_msg(MSGT_DECVIDEO, MSGL_V, " Filename: %s (API revision: %x)\n", filename, mod_hdr->api_rev);
     mp_msg(MSGT_DECVIDEO, MSGL_V, " Codec: %s. Rev: %s\n", mod_hdr->desc, mod_hdr->rev);
@@ -255,7 +255,7 @@ static int xacodec_load(sh_video_t *sh, 
 	dlclose(priv->file_handler);
 	return 0;
     }
-    
+
     mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "Exported functions by codec: [functable: %p entries: %d]\n",
 	mod_hdr->funcs, mod_hdr->num_funcs);
     for (i = 0; i < (int)mod_hdr->num_funcs; i++)
@@ -637,7 +637,7 @@ static int init(sh_video_t *sh)
     char dll[1024];
     XA_CODEC_HDR codec_hdr;
     int i;
-    
+
     priv = malloc(sizeof(vd_xanim_ctx));
     if (!priv)
 	return 0;
@@ -645,7 +645,7 @@ static int init(sh_video_t *sh)
     memset(priv, 0, sizeof(vd_xanim_ctx));
 
     if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12)) return 0;
-    
+
     priv->iq_func = NULL;
     priv->dec_func = NULL;
 
@@ -751,7 +751,7 @@ static mp_image_t* decode(sh_video_t *sh
 {
     vd_xanim_ctx *priv = sh->context;
     unsigned int ret;
-    
+
     if (len <= 0)
 	return NULL; // skipped frame
 
@@ -759,7 +759,7 @@ static mp_image_t* decode(sh_video_t *sh
 
     if(sh->codec->outflags[sh->outfmtidx] & CODECS_FLAG_STATIC){
 	// allocate static buffer for cvid-like codecs:
-	priv->mpi = mpcodecs_get_image(sh, MP_IMGTYPE_STATIC, 
+	priv->mpi = mpcodecs_get_image(sh, MP_IMGTYPE_STATIC,
 	    MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
 	    (sh->disp_w+3)&(~3), (sh->disp_h+3)&(~3));
 	if (!priv->mpi) return NULL;
@@ -817,6 +817,6 @@ static mp_image_t* decode(sh_video_t *sh
 	mp_msg(MSGT_DECVIDEO, MSGL_DBG2, "body\n");
 	return NULL;
     }
-    
+
     return priv->mpi;
 }

Modified: trunk/libmpcodecs/vd_xvid4.c
==============================================================================
--- trunk/libmpcodecs/vd_xvid4.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_xvid4.c	Wed May 13 04:58:57 2009	(r29305)
@@ -103,10 +103,10 @@ static int init(sh_video_t *sh)
 
 	memset(&xvid_gbl_info, 0, sizeof(xvid_gbl_info_t));
 	xvid_gbl_info.version = XVID_VERSION;
-	
+
 	memset(&xvid_ini, 0, sizeof(xvid_gbl_init_t));
 	xvid_ini.version = XVID_VERSION;
-	
+
 	memset(&dec_p, 0, sizeof(xvid_dec_create_t));
 	dec_p.version = XVID_VERSION;
 
@@ -123,16 +123,16 @@ static int init(sh_video_t *sh)
 	case IMGFMT_UYVY:
 		cs = XVID_CSP_UYVY;
 		break;
-	case IMGFMT_I420: 
+	case IMGFMT_I420:
 	case IMGFMT_IYUV:
 		/* We will use our own buffers, this speeds decoding avoiding
 		 * frame memcpy's overhead */
 		cs = (do_dr2)?XVID_CSP_INTERNAL:XVID_CSP_USER;
 		break;
-	case IMGFMT_BGR15: 
+	case IMGFMT_BGR15:
 		cs = XVID_CSP_RGB555;
 		break;
-	case IMGFMT_BGR16: 
+	case IMGFMT_BGR16:
 		cs = XVID_CSP_RGB565;
 		break;
 	case IMGFMT_BGR32:
@@ -157,7 +157,7 @@ static int init(sh_video_t *sh)
 		       XVID_VERSION_PATCH(xvid_gbl_info.actual_version),
 		       xvid_gbl_info.build);
 	}
-	
+
 	/* Initialize the xvidcore library */
 	if(xvid_global(NULL, XVID_GBL_INIT, &xvid_ini, NULL))
 		return 0;
@@ -241,7 +241,7 @@ static mp_image_t* decode(sh_video_t *sh
 	dec.general |= (lumadering ? XVID_DEBLOCKY|XVID_DERINGY : 0 );
 	dec.general |= (chromadering ? XVID_DEBLOCKUV|XVID_DERINGUV : 0 );
 #endif
-	dec.output.csp = p->cs;   
+	dec.output.csp = p->cs;
 
 	/* Decoding loop because xvidcore may return VOL information for
 	 * on the fly buffer resizing. In that case we must decode VOL,
@@ -256,18 +256,18 @@ static mp_image_t* decode(sh_video_t *sh
 			mpi = mpcodecs_get_image(sh, p->img_type,
 					MP_IMGFLAG_ACCEPT_STRIDE,
 					sh->disp_w, sh->disp_h);
-			
+
 			if(p->cs != XVID_CSP_INTERNAL) {
 				dec.output.plane[0] = mpi->planes[0];
 				dec.output.plane[1] = mpi->planes[1];
 				dec.output.plane[2] = mpi->planes[2];
 
-				dec.output.stride[0] = mpi->stride[0]; 
-				dec.output.stride[1] = mpi->stride[1]; 
+				dec.output.stride[0] = mpi->stride[0];
+				dec.output.stride[1] = mpi->stride[1];
 				dec.output.stride[2] = mpi->stride[2];
 			}
 		}
-		
+
 		/* Decode data */
 		consumed = xvid_decore(p->hdl, XVID_DEC_DECODE, &dec, &stats);
 		if (consumed < 0) {
@@ -281,7 +281,7 @@ static mp_image_t* decode(sh_video_t *sh
 			sh->aspect = stats2aspect(&stats);
 			if(!mpcodecs_config_vo(sh, stats.data.vol.width, stats.data.vol.height, IMGFMT_YV12))
 				return NULL;
-			
+
 			/* Don't take this path twice */
 			p->vo_initialized = !p->vo_initialized;
 		}
@@ -294,7 +294,7 @@ static mp_image_t* decode(sh_video_t *sh
 	/* There are two ways to get out of the decoding loop:
 	 *  - a frame has been returned
 	 *  - no more data in buffer and no frames returned */
-	
+
 	/* If mpi is NULL, it proves nothing has been returned by the decoder
 	 * so don't try to display internal buffers. */
 	if (mpi != NULL && p->cs == XVID_CSP_INTERNAL) {
@@ -324,12 +324,12 @@ static float stats2aspect(xvid_dec_stats
 		float wpar;
 		float hpar;
 		float dar;
-	
+
 		/* MPEG4 strem stores PAR (Pixel Aspect Ratio), mplayer uses
 		 * DAR (Display Aspect Ratio)
-		 * 
+		 *
 		 * Both are related thanks to the equation:
-		 *            width 
+		 *            width
 		 *      DAR = ----- x PAR
 		 *            height
 		 *
@@ -378,7 +378,7 @@ static float stats2aspect(xvid_dec_stats
  * Module structure definition
  ****************************************************************************/
 
-static vd_info_t info = 
+static vd_info_t info =
 {
 	"XviD 1.0 decoder",
 	"xvid",

Modified: trunk/libmpcodecs/vd_zrmjpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_zrmjpeg.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vd_zrmjpeg.c	Wed May 13 04:58:57 2009	(r29305)
@@ -36,7 +36,7 @@
 
 #include "vd_internal.h"
 
-static vd_info_t info = 
+static vd_info_t info =
 {
 	"Zoran MJPEG Video passthrough",
 	"zrmjpeg",
@@ -59,7 +59,7 @@ static int query_format(sh_video_t *sh, 
 	if (format == ctx->preferred_csp) return VFCAP_CSP_SUPPORTED;
 	return CONTROL_FALSE;
 }
-	
+
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh, int cmd, void* arg, ...) {
 	switch (cmd) {
@@ -80,9 +80,9 @@ static int init(sh_video_t *sh) {
 	sh->context = ctx;
 
 	/* defer init of vo until the first frame is known */
-	return 1; 
+	return 1;
 #if 0
-	return mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_ZRMJPEGIT); 
+	return mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, IMGFMT_ZRMJPEGIT);
 #endif
 }
 
@@ -122,7 +122,7 @@ static unsigned int guess_mjpeg_type(uns
 		ERROR("JPEG data must start with FFD8, but doesn't\n");
 		return 0;
 	}
-	
+
 	p = 2; /* pointer within jpeg data */
 
 	while (p < size) {
@@ -131,7 +131,7 @@ static unsigned int guess_mjpeg_type(uns
 			p++;
 			if (p >= size) return 0;
 		}
-		
+
 		/* get marker code, skip duplicate FF's */
 		while(data[p] == 0xFF) {
 			p++;
@@ -142,7 +142,7 @@ static unsigned int guess_mjpeg_type(uns
 
 		/* marker may have an associated length */
 		if (p <= size - 2) length = get_int2(data+p);
-		else length = 0; 
+		else length = 0;
 
 		switch (marker) {
 			case M_SOF0:
@@ -163,10 +163,10 @@ static unsigned int guess_mjpeg_type(uns
 
 		/* these markers shouldn't have parameters,
 		 * i.e. we don't need to skip anaything */
-		if (marker == 0 || marker == 1 || 
+		if (marker == 0 || marker == 1 ||
 				(marker >= 0xd0 && marker < 0xd8))
-			continue; 
-		
+			continue;
+
 		if  (p + length <= size) p += length;
 		else {
 			ERROR("input JPEG too short, data missing\n");
@@ -223,9 +223,9 @@ static unsigned int guess_mjpeg_type(uns
 		return IMGFMT_ZRMJPEGIT;
 	}
 
-	
+
 	return 0;
-}	
+}
 
 // decode a frame
 static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags) {
@@ -235,12 +235,12 @@ static mp_image_t* decode(sh_video_t *sh
 	if (!ctx->vo_initialized) {
 		ctx->preferred_csp = guess_mjpeg_type(data, len, sh->disp_h);
 		if (ctx->preferred_csp == 0) return NULL;
-		mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, 
+		mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h,
 				ctx->preferred_csp);
 		ctx->vo_initialized = 1;
 	}
 
-	mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, 
+	mpi = mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0,
 			sh->disp_w, sh->disp_h);
 	/* abuse of mpi */
     	mpi->planes[0]=(uint8_t*)data;

Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ve_lavc.c	Wed May 13 04:58:57 2009	(r29305)
@@ -332,7 +332,7 @@ static int config(struct vf_instance_s* 
 	unsigned int flags, unsigned int outfmt){
     int size, i;
     void *p;
-        
+
     mux_v->bih->biWidth=width;
     mux_v->bih->biHeight=height;
     mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8);
@@ -428,7 +428,7 @@ static int config(struct vf_instance_s* 
 		break;
 	    lavc_venc_context->intra_matrix[i++] = atoi(tmp);
 	}
-	
+
 	if (i != 64)
 	    av_freep(&lavc_venc_context->intra_matrix);
 	else
@@ -448,7 +448,7 @@ static int config(struct vf_instance_s* 
 		break;
 	    lavc_venc_context->inter_matrix[i++] = atoi(tmp);
 	}
-	
+
 	if (i != 64)
 	    av_freep(&lavc_venc_context->inter_matrix);
 	else
@@ -463,7 +463,7 @@ static int config(struct vf_instance_s* 
 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"error parsing vrc_q\n");
             return 0;
         }
-        lavc_venc_context->rc_override= 
+        lavc_venc_context->rc_override=
             realloc(lavc_venc_context->rc_override, sizeof(RcOverride)*(i+1));
         lavc_venc_context->rc_override[i].start_frame= start;
         lavc_venc_context->rc_override[i].end_frame  = end;
@@ -496,7 +496,7 @@ static int config(struct vf_instance_s* 
     {
 	int par_width, par_height, e;
 	float ratio=0;
-	
+
 	e= sscanf (lavc_param_aspect, "%d/%d", &par_width, &par_height);
 	if(e==2){
             if(par_height)
@@ -507,7 +507,7 @@ static int config(struct vf_instance_s* 
 
 	if (e && ratio > 0.1 && ratio < 10.0) {
 	    lavc_venc_context->sample_aspect_ratio= av_d2q(ratio * height / width, 255);
-	    mp_dbg(MSGT_MENCODER, MSGL_DBG2, "sample_aspect_ratio: %d/%d\n", 
+	    mp_dbg(MSGT_MENCODER, MSGL_DBG2, "sample_aspect_ratio: %d/%d\n",
                 lavc_venc_context->sample_aspect_ratio.num,
                 lavc_venc_context->sample_aspect_ratio.den);
 	    mux_v->aspect = ratio;
@@ -540,7 +540,7 @@ static int config(struct vf_instance_s* 
     lavc_venc_context->mb_cmp= lavc_param_mb_cmp;
 #ifdef FF_CMP_VSAD
     lavc_venc_context->ildct_cmp= lavc_param_ildct_cmp;
-#endif    
+#endif
     lavc_venc_context->dia_size= lavc_param_dia_size;
     lavc_venc_context->flags|= lavc_param_qpel;
     lavc_venc_context->trellis = lavc_param_trell;
@@ -562,7 +562,7 @@ static int config(struct vf_instance_s* 
     lavc_venc_context->flags|= lavc_param_gmc;
 #ifdef CODEC_FLAG_CLOSED_GOP
     lavc_venc_context->flags|= lavc_param_closed_gop;
-#endif    
+#endif
     if(lavc_param_gray) lavc_venc_context->flags|= CODEC_FLAG_GRAY;
 
     if(lavc_param_normalize_aqp) lavc_venc_context->flags|= CODEC_FLAG_NORMALIZE_AQP;
@@ -623,7 +623,7 @@ static int config(struct vf_instance_s* 
     switch(lavc_param_vpass){
     case 2:
     case 3:
-	lavc_venc_context->flags|= CODEC_FLAG_PASS2; 
+	lavc_venc_context->flags|= CODEC_FLAG_PASS2;
 	stats_file= fopen(passtmpfile, "rb");
 	if(stats_file==NULL){
 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
@@ -632,21 +632,21 @@ static int config(struct vf_instance_s* 
 	fseek(stats_file, 0, SEEK_END);
 	size= ftell(stats_file);
 	fseek(stats_file, 0, SEEK_SET);
-	
+
 	lavc_venc_context->stats_in= av_malloc(size + 1);
 	lavc_venc_context->stats_in[size]=0;
 
 	if(fread(lavc_venc_context->stats_in, size, 1, stats_file)<1){
 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: reading from filename=%s\n", passtmpfile);
             return 0;
-	}        
+	}
 	if(lavc_param_vpass == 2)
 	    break;
 	else
 	    fclose(stats_file);
 	    /* fall through */
-    case 1: 
-	lavc_venc_context->flags|= CODEC_FLAG_PASS1; 
+    case 1:
+	lavc_venc_context->flags|= CODEC_FLAG_PASS1;
 	stats_file= fopen(passtmpfile, "wb");
 	if(stats_file==NULL){
 	    mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile);
@@ -685,7 +685,7 @@ static int config(struct vf_instance_s* 
     {
 	mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_MPCODECS_UsingConstantQscale, lavc_param_vqscale);
 	lavc_venc_context->flags |= CODEC_FLAG_QSCALE;
-        lavc_venc_context->global_quality= 
+        lavc_venc_context->global_quality=
 	vf->priv->pic->quality = (int)(FF_QP2LAMBDA * lavc_param_vqscale + 0.5);
     }
 
@@ -701,7 +701,7 @@ static int config(struct vf_instance_s* 
 	mp_msg(MSGT_MENCODER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n");
 	return 0;
     }
-    
+
     /* free second pass buffer, its not needed anymore */
     av_freep(&lavc_venc_context->stats_in);
     if(lavc_venc_context->bits_per_coded_sample)
@@ -711,9 +711,9 @@ static int config(struct vf_instance_s* 
         memcpy(mux_v->bih + 1, lavc_venc_context->extradata, lavc_venc_context->extradata_size);
         mux_v->bih->biSize= sizeof(BITMAPINFOHEADER) + lavc_venc_context->extradata_size;
     }
-    
+
     mux_v->decoder_delay = lavc_venc_context->max_b_frames ? 1 : 0;
-    
+
     return 1;
 }
 
@@ -779,9 +779,9 @@ static int put_image(struct vf_instance_
     if(lavc_param_interlaced_dct){
         if((mpi->fields & MP_IMGFIELD_ORDERED) && (mpi->fields & MP_IMGFIELD_INTERLACED))
             pic->top_field_first= !!(mpi->fields & MP_IMGFIELD_TOP_FIRST);
-        else 
+        else
             pic->top_field_first= 1;
-    
+
         if(lavc_param_top!=-1)
             pic->top_field_first= lavc_param_top;
     }
@@ -811,7 +811,7 @@ static int encode_frame(struct vf_instan
 	out_size = avcodec_encode_video(lavc_venc_context, mux_v->buffer, mux_v->buffer_size,
 	    pic);
 
-    if(pts != MP_NOPTS_VALUE) 
+    if(pts != MP_NOPTS_VALUE)
         dts= pts - lavc_venc_context->delay * av_q2d(lavc_venc_context->time_base);
     else
         dts= MP_NOPTS_VALUE;
@@ -831,12 +831,12 @@ static int encode_frame(struct vf_instan
         ++mux_v->encoder_delay;
         return 0;
     }
-           
-    muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0, 
+
+    muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0,
                       dts, pts);
     free(lavc_venc_context->coded_frame->opaque);
     lavc_venc_context->coded_frame->opaque= NULL;
-        
+
     /* store psnr / pict size / type / qscale */
     if(lavc_param_psnr){
         static FILE *fvstats=NULL;
@@ -861,7 +861,7 @@ static int encode_frame(struct vf_instan
                 /*exit(1);*/
             }
         }
-	
+
 	// average MB quantizer
 	q = lavc_venc_context->coded_frame->qscale_table;
 	if(q) {
@@ -874,7 +874,7 @@ static int encode_frame(struct vf_instan
 		q += lavc_venc_context->coded_frame->qstride;
 	    }
 	    quality /= w * h;
-	} else 
+	} else
 	    quality = lavc_venc_context->coded_frame->quality / (float)FF_QP2LAMBDA;
 
         fprintf(fvstats, "%6d, %2.2f, %6d, %2.2f, %2.2f, %2.2f, %2.2f %c\n",
@@ -889,7 +889,7 @@ static int encode_frame(struct vf_instan
             );
     }
     /* store stats if there are any */
-    if(lavc_venc_context->stats_out && stats_file) 
+    if(lavc_venc_context->stats_out && stats_file)
         fprintf(stats_file, "%s", lavc_venc_context->stats_out);
     return out_size;
 }
@@ -899,7 +899,7 @@ static void uninit(struct vf_instance_s*
     if(lavc_param_psnr){
         double f= lavc_venc_context->width*lavc_venc_context->height*255.0*255.0;
         f*= lavc_venc_context->coded_frame->coded_picture_number;
-        
+
         mp_msg(MSGT_MENCODER, MSGL_INFO, "PSNR: Y:%2.2f, Cb:%2.2f, Cr:%2.2f, All:%2.2f\n",
             psnr(lavc_venc_context->error[0]/f),
             psnr(lavc_venc_context->error[1]*4/f),
@@ -914,7 +914,7 @@ static void uninit(struct vf_instance_s*
     avcodec_close(lavc_venc_context);
 
     if(stats_file) fclose(stats_file);
-    
+
     /* free rc_override */
     av_freep(&lavc_venc_context->rc_override);
 

Modified: trunk/libmpcodecs/ve_libdv.c
==============================================================================
--- trunk/libmpcodecs/ve_libdv.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ve_libdv.c	Wed May 13 04:58:57 2009	(r29305)
@@ -31,7 +31,7 @@
 struct vf_priv_s {
     muxer_stream_t* mux;
     dv_encoder_t* enc;
-    
+
 };
 #define mux_v (vf->priv->mux)
 
@@ -44,7 +44,7 @@ static int config(struct vf_instance_s* 
     if(width!=DV_WIDTH || (height!=DV_PAL_HEIGHT && height!=DV_NTSC_HEIGHT)){
 	mp_msg(MSGT_VFILTER,MSGL_ERR,"DV: only 720x480 (NTSC) and 720x576 (PAL) resolutions allowed! Try with -vf scale=720:480\n");
     }
-    
+
     vf->priv->enc->isPAL=(height==DV_PAL_HEIGHT);
     vf->priv->enc->is16x9=(d_width/(float)d_height > 1.7); // 16:9=1.777777
     vf->priv->enc->vlc_encode_passes=3;
@@ -72,7 +72,7 @@ static int query_format(struct vf_instan
 
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
 
-    dv_encode_full_frame(vf->priv->enc, mpi->planes, 
+    dv_encode_full_frame(vf->priv->enc, mpi->planes,
 	(mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb,
 	mux_v->buffer);
 
@@ -91,10 +91,10 @@ static int vf_open(vf_instance_t *vf, ch
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv,0,sizeof(struct vf_priv_s));
     vf->priv->mux=(muxer_stream_t*)args;
-    
+
     vf->priv->enc=dv_encoder_new(0,1,1); // FIXME, parse some options!
     if(!vf->priv->enc) return 0;
-    
+
     mux_v->bih=calloc(1, sizeof(BITMAPINFOHEADER));
     mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
     mux_v->bih->biWidth=0;

Modified: trunk/libmpcodecs/ve_nuv.c
==============================================================================
--- trunk/libmpcodecs/ve_nuv.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ve_nuv.c	Wed May 13 04:58:57 2009	(r29305)
@@ -62,7 +62,7 @@ m_option_t nuvopts_conf[]={
   {"l", &nuv_priv_dflt.l, CONF_TYPE_INT, M_OPT_RANGE,0,20, NULL},
   {"c", &nuv_priv_dflt.c, CONF_TYPE_INT, M_OPT_RANGE,0,20, NULL},
   {NULL, NULL, 0, 0, 0, 0, NULL}
-};  
+};
 
 //===========================================================================//
 
@@ -112,16 +112,16 @@ static int put_image(struct vf_instance_
   memset(header, 0, FRAMEHEADERSIZE); // Reset the header
   if(vf->priv->lzo)
     memset(vf->priv->zbuffer,0,FRAMEHEADERSIZE);
-    
+
   // This has to be don here otherwise tv with sound doesn't work
-  if(!vf->priv->tbl_wrote) {    
+  if(!vf->priv->tbl_wrote) {
     RTjpeg_init_compress((uint32_t *)data,mpi->width,mpi->height,vf->priv->q);
     RTjpeg_init_mcompress();
 
     header[0] = 'D'; // frametype: compressor data
     header[1] = 'R'; // comptype:  compressor data for RTjpeg
     AV_WL32(header + 8, COMPDATASIZE); // packetlength
-  
+
     mux_v->buffer=vf->priv->buffer;
     muxer_write_chunk(mux_v,FRAMEHEADERSIZE + COMPDATASIZE, 0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
     vf->priv->tbl_wrote = 1;
@@ -175,7 +175,7 @@ static int put_image(struct vf_instance_
     }
 
   }
-    
+
   header[0] = 'V'; // frametype: video frame
   AV_WL32(header + 8, len); // packetlength
   mux_v->buffer = header;
@@ -206,7 +206,7 @@ static int vf_open(vf_instance_t *vf, ch
   vf->priv=malloc(sizeof(struct vf_priv_s));
   memcpy(vf->priv, &nuv_priv_dflt,sizeof(struct vf_priv_s));
   vf->priv->mux=(muxer_stream_t*)args;
-  
+
   mux_v->bih=calloc(1, sizeof(BITMAPINFOHEADER));
   mux_v->bih->biSize=sizeof(BITMAPINFOHEADER);
   mux_v->bih->biWidth=0;

Modified: trunk/libmpcodecs/ve_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/ve_qtvideo.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ve_qtvideo.c	Wed May 13 04:58:57 2009	(r29305)
@@ -30,9 +30,9 @@
 #include "mp_msg.h"
 #include "mpbswap.h"
 
-#ifdef WIN32_LOADER 
+#ifdef WIN32_LOADER
 #include "loader/ldt_keeper.h"
-#endif 
+#endif
 
 #include "loader/qtx/qtxsdk/components.h"
 #include "loader/wine/windef.h"
@@ -321,7 +321,7 @@ static int vf_open(vf_instance_t *vf, ch
         mp_msg(MSGT_MENCODER,MSGL_ERR,"unable to load QuickTime.qts\n" );
         return 0;
     }
-    
+
     handler = LoadLibraryA("qtmlClient.dll");
     if(!handler){
         mp_msg(MSGT_MENCODER,MSGL_ERR,"unable to load qtmlClient.dll\n");

Modified: trunk/libmpcodecs/ve_raw.c
==============================================================================
--- trunk/libmpcodecs/ve_raw.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ve_raw.c	Wed May 13 04:58:57 2009	(r29305)
@@ -29,7 +29,7 @@ struct vf_priv_s {
 static int set_format(struct vf_instance_s *vf, unsigned int fmt) {
     if (!force_fourcc)
         mux_v->bih->biCompression = fmt;
-    
+
     mux_v->bih->biPlanes = 1;
     if (IMGFMT_IS_RGB(fmt)) {
 	if (IMGFMT_RGB_DEPTH(fmt) < 8 && !(fmt&128))
@@ -140,7 +140,7 @@ static int vf_open(vf_instance_t *vf, ch
     vf->priv = malloc(sizeof(struct vf_priv_s));
     memset(vf->priv, 0, sizeof(struct vf_priv_s));
     vf->priv->mux = (muxer_stream_t*)args;
-    
+
     mux_v->bih = calloc(1, sizeof(BITMAPINFOHEADER));
     mux_v->bih->biSize = sizeof(BITMAPINFOHEADER);
     mux_v->bih->biWidth = 0;

Modified: trunk/libmpcodecs/ve_vfw.c
==============================================================================
--- trunk/libmpcodecs/ve_vfw.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ve_vfw.c	Wed May 13 04:58:57 2009	(r29305)
@@ -167,7 +167,7 @@ static int vfw_start_encoder(BITMAPINFOH
     return 0;
   }
   mp_msg(MSGT_WIN32,MSGL_V,"ICCompressGetFormat OK\n");
-  
+
   if (temp_len > sizeof(BITMAPINFOHEADER))
   {
     unsigned char* temp=(unsigned char*)output_bih;
@@ -220,7 +220,7 @@ static int vfw_start_encoder(BITMAPINFOH
     mp_msg(MSGT_WIN32,MSGL_INFO,"  biBitCount %d\n", output_bih->biBitCount);
     mp_msg(MSGT_WIN32,MSGL_INFO,"  biCompression 0x%lx ('%.4s')\n", output_bih->biCompression, (char *)&output_bih->biCompression);
     mp_msg(MSGT_WIN32,MSGL_INFO,"  biSizeImage %ld\n", output_bih->biSizeImage);
-  
+
   encoder_buf_size=input_bih->biSizeImage;
   encoder_buf=malloc(encoder_buf_size);
   encoder_frameno=0;

Modified: trunk/libmpcodecs/ve_x264.c
==============================================================================
--- trunk/libmpcodecs/ve_x264.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ve_x264.c	Wed May 13 04:58:57 2009	(r29305)
@@ -158,7 +158,7 @@ static int config(struct vf_instance_s* 
     mod->mux->bih->biHeight = height;
     mod->mux->bih->biSizeImage = width * height * 3;
     mod->mux->aspect = (float)d_width/d_height;
-    
+
     // make sure param is initialized
     x264enc_set_param(NULL, "");
     param.i_width = width;
@@ -181,7 +181,7 @@ static int config(struct vf_instance_s* 
         mp_msg(MSGT_MENCODER, MSGL_ERR, "Wrong colorspace.\n");
         return 0;
     }
-    
+
     mod->x264 = x264_encoder_open(&param);
     if(!mod->x264) {
         mp_msg(MSGT_MENCODER, MSGL_ERR, "x264_encoder_open failed.\n");
@@ -206,12 +206,12 @@ static int config(struct vf_instance_s* 
         memcpy(mod->mux->bih + 1, extradata, extradata_size);
         mod->mux->bih->biSize= sizeof(BITMAPINFOHEADER) + extradata_size;
     }
-    
+
     if (param.i_bframe > 1 && param.b_bframe_pyramid)
         mod->mux->decoder_delay = 2;
     else
         mod->mux->decoder_delay = param.i_bframe ? 1 : 0;
-    
+
     return 1;
 }
 
@@ -251,7 +251,7 @@ static int put_image(struct vf_instance_
 {
     h264_module_t *mod=(h264_module_t*)vf->priv;
     int i;
-    
+
     memset(&mod->pic, 0, sizeof(x264_picture_t));
     mod->pic.img.i_csp=param.i_csp;
     mod->pic.img.i_plane=3;
@@ -278,7 +278,7 @@ static int encode_frame(struct vf_instan
         mp_msg(MSGT_MENCODER, MSGL_ERR, "x264_encoder_encode failed\n");
         return -1;
     }
-    
+
     for(i=0; i < i_nal; i++) {
         int i_data = mod->mux->buffer_size - i_size;
         i_size += x264_nal_encode(mod->mux->buffer + i_size, &i_data, 1, &nal[i]);

Modified: trunk/libmpcodecs/ve_xvid4.c
==============================================================================
--- trunk/libmpcodecs/ve_xvid4.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/ve_xvid4.c	Wed May 13 04:58:57 2009	(r29305)
@@ -256,7 +256,7 @@ m_option_t xvidencopts_conf[] =
 	{"frame_drop_ratio", &xvidenc_frame_drop_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
 	{"max_key_interval", &xvidenc_max_key_interval, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},
 	{"greyscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 0, 1, NULL}, /* kept for backward compatibility */
-	{"grayscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 0, 1, NULL},		
+	{"grayscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nogreyscale", &xvidenc_greyscale, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"lumi_mask", &xvidenc_luminance_masking, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"nolumi_mask", &xvidenc_luminance_masking, CONF_TYPE_FLAG, 0, 1, 0, NULL},
@@ -347,9 +347,9 @@ typedef struct xvid_mplayer_module_t
 	int max_sse_u;
 	int max_sse_v;
 	int max_framenum;
-	
+
 	int pixels;
-	
+
 	/* DAR/PAR and all that thingies */
 	int d_width;
 	int d_height;
@@ -380,11 +380,11 @@ config(struct vf_instance_s* vf,
 {
 	int err;
 	xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv;
-	
+
 	/* Complete the muxer initialization */
 	mod->mux->bih->biWidth = width;
 	mod->mux->bih->biHeight = height;
-	mod->mux->bih->biSizeImage = 
+	mod->mux->bih->biSizeImage =
 		mod->mux->bih->biWidth * mod->mux->bih->biHeight * 3 / 2;
 	mod->mux->aspect = (float)d_width/d_height;
 
@@ -425,7 +425,7 @@ config(struct vf_instance_s* vf,
 		       "xvid: xvidcore returned a '%s' error\n", errorstring(err));
 		return BAD;
 	}
-	
+
 	/* Store the encoder instance into the private data */
 	mod->instance = mod->create.handle;
 
@@ -517,7 +517,7 @@ static int
 put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
 {
 	int size;
-	xvid_enc_stats_t stats; 
+	xvid_enc_stats_t stats;
 	xvid_mplayer_module_t *mod = (xvid_mplayer_module_t *)vf->priv;
 
 	/* Prepare the stats */
@@ -630,7 +630,7 @@ vf_open(vf_instance_t *vf, char* args)
 		       XVID_VERSION_PATCH(xvid_gbl_info.actual_version),
 		       xvid_gbl_info.build);
 	}
-		
+
 	/* Initialize the xvid_gbl_init structure */
 	memset(&xvid_gbl_init, 0, sizeof(xvid_gbl_init_t));
 	xvid_gbl_init.version = XVID_VERSION;
@@ -681,7 +681,7 @@ static int dispatch_settings(xvid_mplaye
 			"xvid:[ERROR] \"%s\" is an invalid profile name\n", xvidenc_profile);
 		return BAD;
 	}
-	
+
 	/* -------------------------------------------------------------------
 	 * Dispatch all settings having an impact on the "create" structure
 	 * This includes plugins as they are passed to encore through the
@@ -736,7 +736,7 @@ static int dispatch_settings(xvid_mplaye
 	if(selected_profile->flags & PROFILE_DXN)
 		create->global |= XVID_GLOBAL_DIVX5_USERDATA;
 #endif
-	
+
 	create->max_key_interval = xvidenc_max_key_interval;
 	create->frame_drop_ratio = xvidenc_frame_drop_ratio;
 	create->min_quant[0] = xvidenc_min_quant[0];
@@ -899,12 +899,12 @@ static int dispatch_settings(xvid_mplaye
 
 	if( !(selected_profile->flags & PROFILE_DXN) )
 	{
-	if(xvidenc_dar_aspect > 0) 
+	if(xvidenc_dar_aspect > 0)
 	    ar = av_d2q(xvidenc_dar_aspect * mod->mux->bih->biHeight / mod->mux->bih->biWidth, 255);
 	else if(xvidenc_autoaspect)
 	    ar = av_d2q((float)mod->d_width / mod->d_height * mod->mux->bih->biHeight / mod->mux->bih->biWidth, 255);
 	else ar.num = ar.den = 0;
-	
+
 	if(ar.den != 0) {
 		if(ar.num == 12 && ar.den == 11)
 		    frame->par = XVID_PAR_43_PAL;
@@ -915,12 +915,12 @@ static int dispatch_settings(xvid_mplaye
 		else if(ar.num == 40 && ar.den == 33)
 		    frame->par = XVID_PAR_169_NTSC;
 		else
-		{    
+		{
 		    frame->par = XVID_PAR_EXT;
 		    frame->par_width = ar.num;
 		    frame->par_height= ar.den;
 		}
-			
+
 	} else if(xvidenc_par != NULL) {
 		if(strcasecmp(xvidenc_par, "pal43") == 0)
 			frame->par = XVID_PAR_43_PAL;
@@ -947,7 +947,7 @@ static int dispatch_settings(xvid_mplaye
 	}
 
 	/* Display par information */
-	mp_msg(MSGT_MENCODER, MSGL_INFO, "xvid: par=%d/%d (%s), displayed=%dx%d, sampled=%dx%d\n", 
+	mp_msg(MSGT_MENCODER, MSGL_INFO, "xvid: par=%d/%d (%s), displayed=%dx%d, sampled=%dx%d\n",
 			ar.num, ar.den, par_string(frame->par),
 			mod->d_width, mod->d_height, mod->mux->bih->biWidth, mod->mux->bih->biHeight);
 	}
@@ -1101,7 +1101,7 @@ static int set_create_struct(xvid_mplaye
 			       squant.num,
 			       squant.den,
 			       (float)(squant.num)/(float)(squant.den));
-			
+
 		} else {
 			mp_msg(MSGT_MENCODER, MSGL_INFO,
 			       "xvid: CBR Rate Control -- bitrate=%dkbit/s\n",
@@ -1272,7 +1272,7 @@ static int set_frame_struct(xvid_mplayer
 }
 
 static void
-flush_internal_buffers(xvid_mplayer_module_t *mod)		
+flush_internal_buffers(xvid_mplayer_module_t *mod)
 {
 	int size;
 	xvid_enc_frame_t *frame = &mod->frame;
@@ -1336,7 +1336,7 @@ update_stats(xvid_mplayer_module_t *mod,
 			mod->max_sse_v = stats->sse_v;
 			mod->max_framenum = mod->frames;
 		}
-		
+
 		if (xvidenc_psnr) {
 			if (!mod->fvstats) {
 				char filename[20];
@@ -1408,7 +1408,7 @@ static void *read_matrix(unsigned char *
 	int i;
 	unsigned char *matrix;
 	FILE *input;
-	
+
 	/* Allocate matrix space */
 	if((matrix = malloc(64*sizeof(unsigned char))) == NULL)
 	   return NULL;
@@ -1450,7 +1450,7 @@ static void *read_matrix(unsigned char *
 	fclose(input);
 
 	return matrix;
-	
+
 }
 
 

Modified: trunk/libmpcodecs/vf.c
==============================================================================
--- trunk/libmpcodecs/vf.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf.c	Wed May 13 04:58:57 2009	(r29305)
@@ -268,12 +268,12 @@ mp_image_t* vf_get_image(vf_instance_t* 
   if (h == -1) h = vf->h;
 
   w2=(mp_imgflag&MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE)?((w+15)&(~15)):w;
-  
+
   if(vf->put_image==vf_next_put_image){
       // passthru mode, if the filter uses the fallback/default put_image() code
       return vf_get_image(vf->next,outfmt,mp_imgtype,mp_imgflag,w,h);
   }
-  
+
   // Note: we should call libvo first to check if it supports direct rendering
   // and if not, then fallback to software buffers:
   switch(mp_imgtype & 0xff){
@@ -343,7 +343,7 @@ mp_image_t* vf_get_image(vf_instance_t* 
 
 	// check libvo first!
 	if(vf->get_image) vf->get_image(vf,mpi);
-	
+
         if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
           // non-direct and not yet allocated image. allocate it!
           if (!mpi->bpp) { // no way we can allocate this
@@ -351,8 +351,8 @@ mp_image_t* vf_get_image(vf_instance_t* 
                      "vf_get_image: Tried to allocate a format that can not be allocated!\n");
               return NULL;
           }
-	  
-	  // check if codec prefer aligned stride:  
+
+	  // check if codec prefer aligned stride:
 	  if(mp_imgflag&MP_IMGFLAG_PREFER_ALIGNED_STRIDE){
 	      int align=(mpi->flags&MP_IMGFLAG_PLANAR &&
 	                 mpi->flags&MP_IMGFLAG_YUV) ?
@@ -369,7 +369,7 @@ mp_image_t* vf_get_image(vf_instance_t* 
 		  }
 	      }
 	  }
-	  
+
 	  // IF09 - allocate space for 4. plane delta info - unused
 	  if (mpi->imgfmt == IMGFMT_IF09)
 	  {
@@ -382,9 +382,9 @@ mp_image_t* vf_get_image(vf_instance_t* 
 	     mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8);
 	  if(mpi->flags&MP_IMGFLAG_PLANAR){
 	      // YV12/I420/YVU9/IF09. feel free to add other planar formats here...
-	      //if(!mpi->stride[0]) 
+	      //if(!mpi->stride[0])
 	      mpi->stride[0]=mpi->width;
-	      //if(!mpi->stride[1]) 
+	      //if(!mpi->stride[1])
 	      if(mpi->num_planes > 2){
 	      mpi->stride[1]=mpi->stride[2]=mpi->chroma_width;
 	      if(mpi->flags&MP_IMGFLAG_SWAPPED){
@@ -402,7 +402,7 @@ mp_image_t* vf_get_image(vf_instance_t* 
 	          mpi->planes[1]=mpi->planes[0]+mpi->width*mpi->height;
 	      }
 	  } else {
-	      //if(!mpi->stride[0]) 
+	      //if(!mpi->stride[0])
 	      mpi->stride[0]=mpi->width*mpi->bpp/8;
 	  }
 //	  printf("clearing img!\n");
@@ -725,7 +725,7 @@ void vf_next_draw_slice(struct vf_instan
 
 vf_instance_t* append_filters(vf_instance_t* last){
   vf_instance_t* vf;
-  int i; 
+  int i;
 
   if(vf_settings) {
     // We want to add them in the 'right order'

Modified: trunk/libmpcodecs/vf.h
==============================================================================
--- trunk/libmpcodecs/vf.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf.h	Wed May 13 04:58:57 2009	(r29305)
@@ -67,7 +67,7 @@ typedef struct vf_instance_s {
 // control codes:
 #include "mpc_info.h"
 
-typedef struct vf_seteq_s 
+typedef struct vf_seteq_s
 {
     const char *item;
     int value;

Modified: trunk/libmpcodecs/vf_1bpp.c
==============================================================================
--- trunk/libmpcodecs/vf_1bpp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_1bpp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -25,7 +25,7 @@ static const unsigned int bgr_list[]={
     IMGFMT_IYUV,
     IMGFMT_422P,
     IMGFMT_444P,
-    
+
     IMGFMT_YUY2,
     IMGFMT_BGR15,
     IMGFMT_RGB15,
@@ -105,7 +105,7 @@ static void convert(mp_image_t *mpi, mp_
 
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
-    
+
     // hope we'll get DR buffer:
     dmpi=vf_get_image(vf->next,vf->priv->fmt,
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,

Modified: trunk/libmpcodecs/vf_2xsai.c
==============================================================================
--- trunk/libmpcodecs/vf_2xsai.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_2xsai.c	Wed May 13 04:58:57 2009	(r29305)
@@ -30,11 +30,11 @@ int Init_2xSaI(int d)
 
 	int minr = 0, ming = 0, minb = 0;
 	int i;
-	
+
 //	if (d != 15 && d != 16 && d != 24 && d != 32)
 //		return -1;
 
-	/* Get lowest color bit */	
+	/* Get lowest color bit */
 	for (i = 0; i < 255; i++) {
 		if (!minr)
 			minr = makecol(i, 0, 0);
@@ -52,7 +52,7 @@ int Init_2xSaI(int d)
 	greenMask = makecol_depth(d, 0, 255, 0);
 
 	PixelsPerMask = (d <= 16) ? 2 : 1;
-	
+
 	if (PixelsPerMask == 2) {
 		colorMask |= (colorMask << 16);
 		qcolorMask |= (qcolorMask << 16);
@@ -64,7 +64,7 @@ int Init_2xSaI(int d)
 //	TRACE("Low Pixel Mask:   0x%lX\n", lowPixelMask);
 //	TRACE("QColor Mask:      0x%lX\n", qcolorMask);
 //	TRACE("QLow Pixel Mask:  0x%lX\n", qlowpixelMask);
-	
+
 	return 0;
 }
 
@@ -77,7 +77,7 @@ int Init_2xSaI(int d)
 	+ ((((A & qlowpixelMask) + (B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask)) >> 2) & qlowpixelMask)
 
 
-void Super2xSaI_ex(uint8_t *src, uint32_t src_pitch, 
+void Super2xSaI_ex(uint8_t *src, uint32_t src_pitch,
 		   uint8_t *dst, uint32_t dst_pitch,
 		   uint32_t width, uint32_t height, int sbpp) {
 
@@ -90,9 +90,9 @@ void Super2xSaI_ex(uint8_t *src, uint32_
 	src_line[1] = src;
 	src_line[2] = src + src_pitch;
 	src_line[3] = src + src_pitch * 2;
-	
+
 	x = 0, y = 0;
-	
+
 	if (PixelsPerMask == 2) {
 		unsigned short *sbp;
 		sbp = (unsigned short*)src_line[0];
@@ -119,9 +119,9 @@ void Super2xSaI_ex(uint8_t *src, uint32_
 
 		dst_line[0] = dst + dst_pitch*2*y;
 		dst_line[1] = dst + dst_pitch*(2*y+1);
-	
+
 		/* Todo: x = width - 2, x = width - 1 */
-		
+
 		for (x = 0; x < width; x++) {
 			uint32_t product1a, product1b, product2a, product2b;
 
@@ -152,7 +152,7 @@ void Super2xSaI_ex(uint8_t *src, uint32_
 					product1b = color[5];
 				else
 					product1b = INTERPOLATE(color[5], color[6]);
-					
+
 				product2b = product1b;
 
 			}
@@ -185,7 +185,7 @@ void Super2xSaI_ex(uint8_t *src, uint32_
 				product1a = INTERPOLATE(color[9], color[5]);
 			else
 				product1a = color[5];
-	
+
 			if (PixelsPerMask == 2) {
 				*((uint32_t *) (&dst_line[0][x * 4])) = product1a | (product1b << 16);
 				*((uint32_t *) (&dst_line[1][x * 4])) = product2a | (product2b << 16);
@@ -196,16 +196,16 @@ void Super2xSaI_ex(uint8_t *src, uint32_
 				*((uint32_t *) (&dst_line[1][x * 8])) = product2a;
 				*((uint32_t *) (&dst_line[1][x * 8 + 4])) = product2b;
 			}
-			
+
 			/* Move color matrix forward */
 			color[0] = color[1]; color[4] = color[5]; color[8] = color[9];   color[12] = color[13];
 			color[1] = color[2]; color[5] = color[6]; color[9] = color[10];  color[13] = color[14];
 			color[2] = color[3]; color[6] = color[7]; color[10] = color[11]; color[14] = color[15];
-			
+
 			if (x < width - 3) {
 				x += 3;
 				if (PixelsPerMask == 2) {
-					color[3] = *(((unsigned short*)src_line[0]) + x);					
+					color[3] = *(((unsigned short*)src_line[0]) + x);
 					color[7] = *(((unsigned short*)src_line[1]) + x);
 					color[11] = *(((unsigned short*)src_line[2]) + x);
 					color[15] = *(((unsigned short*)src_line[3]) + x);
@@ -223,14 +223,14 @@ void Super2xSaI_ex(uint8_t *src, uint32_
 		/* We're done with one line, so we shift the source lines up */
 		src_line[0] = src_line[1];
 		src_line[1] = src_line[2];
-		src_line[2] = src_line[3];		
+		src_line[2] = src_line[3];
 
 		/* Read next line */
 		if (y + 3 >= height)
 			src_line[3] = src_line[2];
 		else
 			src_line[3] = src_line[2] + src_pitch;
-			
+
 		/* Then shift the color matrix up */
 		if (PixelsPerMask == 2) {
 			unsigned short *sbp;
@@ -254,9 +254,9 @@ void Super2xSaI_ex(uint8_t *src, uint32_
 			lbp = (uint32_t*)src_line[3];
 			color[12] = *lbp;    color[13] = color[12];  color[14] = *(lbp + 1); color[15] = *(lbp + 2);
 		}
-		
+
 	} // y loop
-	
+
 }
 
 
@@ -282,7 +282,7 @@ static int put_image(struct vf_instance_
     Super2xSaI_ex(mpi->planes[0], mpi->stride[0],
 		  dmpi->planes[0], dmpi->stride[0],
 		  mpi->w, mpi->h, mpi->bpp/8);
-    
+
     return vf_next_put_image(vf,dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_ass.c	Wed May 13 04:58:57 2009	(r29305)
@@ -87,12 +87,12 @@ static int config(struct vf_instance_s* 
 	if(!opt_screen_size_x && !opt_screen_size_y){
 		d_width = d_width * vf->priv->outw / width;
 		d_height = d_height * vf->priv->outh / height;
-	} 
+	}
 
 	vf->priv->planes[1] = malloc(vf->priv->outw * vf->priv->outh);
 	vf->priv->planes[2] = malloc(vf->priv->outw * vf->priv->outh);
 	vf->priv->dirty_rows = malloc(vf->priv->outh);
-	
+
 	if (vf->priv->ass_priv) {
 		ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh, 0);
 		ass_set_aspect_ratio(vf->priv->ass_priv, ((double)d_width) / d_height);
@@ -106,10 +106,10 @@ static void get_image(struct vf_instance
 	if(mpi->type == MP_IMGTYPE_IPB) return;
 	if(mpi->flags & MP_IMGFLAG_PRESERVE) return;
 	if(mpi->imgfmt != vf->priv->outfmt) return; // colorspace differ
-	    
+
 	// width never changes, always try full DR
 	mpi->priv = vf->dmpi = vf_get_image(vf->next, mpi->imgfmt,
-			mpi->type, mpi->flags | MP_IMGFLAG_READABLE, 
+			mpi->type, mpi->flags | MP_IMGFLAG_READABLE,
 			vf->priv->outw,
 			vf->priv->outh);
 
@@ -222,7 +222,7 @@ static void copy_from_image(struct vf_in
 	for (pl = 1; pl < 3; ++pl) {
 		int dst_stride = vf->priv->outw;
 		int src_stride = vf->dmpi->stride[pl];
-		
+
 		unsigned char* src = vf->dmpi->planes[pl] + (first_row/2) * src_stride;
 		unsigned char* dst = vf->priv->planes[pl] + first_row * dst_stride;
 		unsigned char* dst_next = dst + dst_stride;
@@ -257,7 +257,7 @@ static void copy_to_image(struct vf_inst
 	for (pl = 1; pl < 3; ++pl) {
 		int dst_stride = vf->dmpi->stride[pl];
 		int src_stride = vf->priv->outw;
-		
+
 		unsigned char* dst = vf->dmpi->planes[pl];
 		unsigned char* src = vf->priv->planes[pl];
 		unsigned char* src_next = vf->priv->planes[pl] + src_stride;
@@ -306,7 +306,7 @@ static void my_draw_bitmap(struct vf_ins
 		dsty += dmpi->stride[0];
 		dstu += vf->priv->outw;
 		dstv += vf->priv->outw;
-	} 
+	}
 }
 
 static int render_frame(struct vf_instance_s* vf, mp_image_t *mpi, const ass_image_t* img)
@@ -329,7 +329,7 @@ static int put_image(struct vf_instance_
 	ass_image_t* images = 0;
 	if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE))
 		images = ass_mp_render_frame(vf->priv->ass_priv, ass_track, (pts+sub_delay) * 1000 + .5, NULL);
-	
+
 	prepare_image(vf, mpi);
 	if (images) render_frame(vf, mpi, images);
 
@@ -392,10 +392,10 @@ static int open(vf_instance_t *vf, char*
 		uninit(vf);
 		return 0;
 	}
-	
+
 	if (vf->priv->auto_insert)
 		mp_msg(MSGT_ASS, MSGL_INFO, "[ass] auto-open\n");
-	
+
 	vf->config = config;
 	vf->query_format = query_format;
 	vf->uninit = uninit;

Modified: trunk/libmpcodecs/vf_bmovl.c
==============================================================================
--- trunk/libmpcodecs/vf_bmovl.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_bmovl.c	Wed May 13 04:58:57 2009	(r29305)
@@ -211,7 +211,7 @@ _read_cmd(int fd, char *cmd, char *args)
 	}
 	return TRUE;
 }
-			
+
 
 static int
 put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){
@@ -318,7 +318,7 @@ put_image(struct vf_instance_s* vf, mp_i
 				vf->priv->x2 = av_clip(imgx + imgw, vf->priv->x2, vf->priv->w);
 				vf->priv->y2 = av_clip(imgy + imgh, vf->priv->y2, vf->priv->h);
 			}
-			
+
 			if( command == CMD_CLEAR ) {
 				sscanf( args, "%d %d %d %d", &imgw, &imgh, &imgx, &imgy);
 				mp_msg(MSGT_VFILTER, MSGL_DBG2, "\nDEBUG: CLEAR: %d %d %d %d\n\n", imgw, imgh, imgx, imgy);
@@ -435,19 +435,19 @@ put_image(struct vf_instance_s* vf, mp_i
 						dmpi->planes[2][pos] = vf->priv->bitmap.v[pos];
 					}
 				} else { // Alphablended pixel
-					dmpi->planes[0][pos] = 
-						((255 - alpha) * (int)dmpi->planes[0][pos] + 
+					dmpi->planes[0][pos] =
+						((255 - alpha) * (int)dmpi->planes[0][pos] +
 						alpha * (int)vf->priv->bitmap.y[pos]) >> 8;
-					
+
 					if ((ypos%2) && (xpos%2)) {
 						pos = ( (ypos/2) * dmpi->stride[1] ) + (xpos/2);
 
-						dmpi->planes[1][pos] = 
-							((255 - alpha) * (int)dmpi->planes[1][pos] + 
+						dmpi->planes[1][pos] =
+							((255 - alpha) * (int)dmpi->planes[1][pos] +
 							alpha * (int)vf->priv->bitmap.u[pos]) >> 8;
-						
-						dmpi->planes[2][pos] = 
-							((255 - alpha) * (int)dmpi->planes[2][pos] + 
+
+						dmpi->planes[2][pos] =
+							((255 - alpha) * (int)dmpi->planes[2][pos] +
 							alpha * (int)vf->priv->bitmap.v[pos]) >> 8;
 					}
 			    }

Modified: trunk/libmpcodecs/vf_boxblur.c
==============================================================================
--- trunk/libmpcodecs/vf_boxblur.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_boxblur.c	Wed May 13 04:58:57 2009	(r29305)
@@ -84,7 +84,7 @@ static inline void blur(uint8_t *dst, ui
 static inline void blur2(uint8_t *dst, uint8_t *src, int w, int radius, int power, int dstStep, int srcStep){
 	uint8_t temp[2][4096];
 	uint8_t *a= temp[0], *b=temp[1];
-	
+
 	if(radius){
 		blur(a, src, w, radius, 1, srcStep);
 		for(; power>2; power--){
@@ -108,9 +108,9 @@ static inline void blur2(uint8_t *dst, u
 
 static void hBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int radius, int power){
 	int y;
-	
+
 	if(radius==0 && dst==src) return;
-	
+
 	for(y=0; y<h; y++){
 		blur2(dst + y*dstStride, src + y*srcStride, w, radius, power, 1, 1);
 	}
@@ -119,7 +119,7 @@ static void hBlur(uint8_t *dst, uint8_t 
 //FIXME optimize (x before y !!!)
 static void vBlur(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, int radius, int power){
 	int x;
-	
+
 	if(radius==0 && dst==src) return;
 
 	for(x=0; x<w; x++){
@@ -136,21 +136,21 @@ static int put_image(struct vf_instance_
 		mpi->w,mpi->h);
 
 	assert(mpi->flags&MP_IMGFLAG_PLANAR);
-	
-	hBlur(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, 
+
+	hBlur(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h,
 		dmpi->stride[0], mpi->stride[0], vf->priv->lumaParam.radius, vf->priv->lumaParam.power);
-	hBlur(dmpi->planes[1], mpi->planes[1], cw,ch, 
+	hBlur(dmpi->planes[1], mpi->planes[1], cw,ch,
 		dmpi->stride[1], mpi->stride[1], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
-	hBlur(dmpi->planes[2], mpi->planes[2], cw,ch, 
+	hBlur(dmpi->planes[2], mpi->planes[2], cw,ch,
 		dmpi->stride[2], mpi->stride[2], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
-	
-	vBlur(dmpi->planes[0], dmpi->planes[0], mpi->w,mpi->h, 
+
+	vBlur(dmpi->planes[0], dmpi->planes[0], mpi->w,mpi->h,
 		dmpi->stride[0], dmpi->stride[0], vf->priv->lumaParam.radius, vf->priv->lumaParam.power);
-	vBlur(dmpi->planes[1], dmpi->planes[1], cw,ch, 
+	vBlur(dmpi->planes[1], dmpi->planes[1], cw,ch,
 		dmpi->stride[1], dmpi->stride[1], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
-	vBlur(dmpi->planes[2], dmpi->planes[2], cw,ch, 
+	vBlur(dmpi->planes[2], dmpi->planes[2], cw,ch,
 		dmpi->stride[2], dmpi->stride[2], vf->priv->chromaParam.radius, vf->priv->chromaParam.power);
-    
+
 	return vf_next_put_image(vf,dmpi, pts);
 }
 
@@ -182,14 +182,14 @@ static int open(vf_instance_t *vf, char*
 	memset(vf->priv, 0, sizeof(struct vf_priv_s));
 
 	if(args==NULL) return 0;
-	
+
 	e=sscanf(args, "%d:%d:%d:%d",
 		&vf->priv->lumaParam.radius,
 		&vf->priv->lumaParam.power,
 		&vf->priv->chromaParam.radius,
 		&vf->priv->chromaParam.power
 		);
-	
+
 	if(e==2){
 		vf->priv->chromaParam.radius= vf->priv->lumaParam.radius;
 		vf->priv->chromaParam.power = vf->priv->lumaParam.power;
@@ -198,7 +198,7 @@ static int open(vf_instance_t *vf, char*
 
 	if(vf->priv->lumaParam.radius < 0) return 0;
 	if(vf->priv->chromaParam.radius < 0) return 0;
-		
+
 	return 1;
 }
 

Modified: trunk/libmpcodecs/vf_crop.c
==============================================================================
--- trunk/libmpcodecs/vf_crop.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_crop.c	Wed May 13 04:58:57 2009	(r29305)
@@ -152,7 +152,7 @@ static int open(vf_instance_t *vf, char*
     vf->priv->crop_w=
     vf->priv->crop_h=-1;
     } //if(!vf->priv)
-    if(args) sscanf(args, "%d:%d:%d:%d", 
+    if(args) sscanf(args, "%d:%d:%d:%d",
     &vf->priv->crop_w,
     &vf->priv->crop_h,
     &vf->priv->crop_x,

Modified: trunk/libmpcodecs/vf_cropdetect.c
==============================================================================
--- trunk/libmpcodecs/vf_cropdetect.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_cropdetect.c	Wed May 13 04:58:57 2009	(r29305)
@@ -73,7 +73,7 @@ static int put_image(struct vf_instance_
     dmpi->height=mpi->height;
 
 if(++vf->priv->fno>2){	// ignore first 2 frames - they may be empty
-    
+
     for(y=0;y<vf->priv->y1;y++){
 	if(checkline(mpi->planes[0]+mpi->stride[0]*y,bpp,mpi->w,bpp)>vf->priv->limit){
 	    vf->priv->y1=y;
@@ -106,7 +106,7 @@ if(++vf->priv->fno>2){	// ignore first 2
     // make sure they stay rounded!
     x=(vf->priv->x1+1)&(~1);
     y=(vf->priv->y1+1)&(~1);
-    
+
     w = vf->priv->x2 - x + 1;
     h = vf->priv->y2 - y + 1;
 

Modified: trunk/libmpcodecs/vf_decimate.c
==============================================================================
--- trunk/libmpcodecs/vf_decimate.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_decimate.c	Wed May 13 04:58:57 2009	(r29305)
@@ -27,10 +27,10 @@ static int diff_MMX(unsigned char *old, 
 		"movl $8, %%ecx \n\t"
 		"pxor %%mm4, %%mm4 \n\t"
 		"pxor %%mm7, %%mm7 \n\t"
-		
+
 		ASMALIGN(4)
 		"1: \n\t"
-		
+
 		"movq (%%"REG_S"), %%mm0 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
 		"add %%"REG_a", %%"REG_S" \n\t"
@@ -48,12 +48,12 @@ static int diff_MMX(unsigned char *old, 
 		"paddw %%mm1, %%mm4 \n\t"
 		"paddw %%mm2, %%mm4 \n\t"
 		"paddw %%mm3, %%mm4 \n\t"
-		
+
 		"decl %%ecx \n\t"
 		"jnz 1b \n\t"
 		"movq %%mm4, (%%"REG_d") \n\t"
 		"emms \n\t"
-		: 
+		:
 		: "S" (old), "D" (new), "a" ((long)os), "b" ((long)ns), "d" (out)
 		: "%ecx", "memory"
 		);
@@ -132,7 +132,7 @@ static int put_image(struct vf_instance_
 	}
 	vf->priv->last++;
 	vf->priv->cnt=0;
-	
+
 	memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h,
 		dmpi->stride[0], mpi->stride[0]);
 	if (mpi->flags & MP_IMGFLAG_PLANAR) {

Modified: trunk/libmpcodecs/vf_delogo.c
==============================================================================
--- trunk/libmpcodecs/vf_delogo.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_delogo.c	Wed May 13 04:58:57 2009	(r29305)
@@ -54,11 +54,11 @@ static void delogo(uint8_t *dst, uint8_t
     int y, x;
     int interp, dist;
     uint8_t *xdst, *xsrc;
-    
+
     uint8_t *topleft, *botleft, *topright;
     int xclipl, xclipr, yclipt, yclipb;
     int logo_x1, logo_x2, logo_y1, logo_y2;
-    
+
     xclipl = MAX(-logo_x, 0);
     xclipr = MAX(logo_x+logo_w-width, 0);
     yclipt = MAX(-logo_y, 0);
@@ -77,7 +77,7 @@ static void delogo(uint8_t *dst, uint8_t
 
     dst += (logo_y1+1)*dstStride;
     src += (logo_y1+1)*srcStride;
-    
+
     for(y = logo_y1+1; y < logo_y2-1; y++)
     {
 	for (x = logo_x1+1, xdst = dst+logo_x1+1, xsrc = src+logo_x1+1; x < logo_x2-1; x++, xdst++, xsrc++) {
@@ -198,7 +198,7 @@ static unsigned int fmt_list[]={
 
 static int open(vf_instance_t *vf, char* args){
     int res;
-    
+
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -230,7 +230,7 @@ static int open(vf_instance_t *vf, char*
 	vf->priv->band = 4;
 	vf->priv->show = 1;
     }
-    
+
 
     vf->priv->lw += vf->priv->band*2;
     vf->priv->lh += vf->priv->band*2;

Modified: trunk/libmpcodecs/vf_detc.c
==============================================================================
--- trunk/libmpcodecs/vf_detc.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_detc.c	Wed May 13 04:58:57 2009	(r29305)
@@ -144,11 +144,11 @@ static int analyze_fixed_pattern(struct 
 static int analyze_aggressive(struct vf_priv_s *p, mp_image_t *new, mp_image_t *old)
 {
 	struct metrics m, pm;
-	
+
 	if (p->frame >= 0) p->frame = (p->frame+1)%5;
-	
+
 	diff_fields(&m, old, new);
-	
+
 	status(p->frame, &m);
 
 	pm = p->pm;
@@ -173,7 +173,7 @@ static int analyze_aggressive(struct vf_
 				p->pm = pm; /* hack :) */
 				p->frame = 3;
 				return TC_IL1;
-			} 
+			}
 		} else {
 			mp_msg(MSGT_VFILTER, MSGL_V, "mismatched telecine fields!\n");
 			p->frame = -1;
@@ -283,7 +283,7 @@ static int do_put_image(struct vf_instan
 		dropflag = (++p->lastdrop >= 5) && (4*p->inframes <= 5*p->outframes);
 		break;
 	}
-	
+
 	if (dropflag) {
 		mp_msg(MSGT_VFILTER, MSGL_V, "drop! [%d/%d=%g]\n",
 			p->outframes, p->inframes, (float)p->outframes/p->inframes);
@@ -311,7 +311,7 @@ static int put_image(struct vf_instance_
 	else dmpi = vf_get_image(vf->next, mpi->imgfmt,
 		MP_IMGTYPE_STATIC, MP_IMGFLAG_ACCEPT_STRIDE |
 		MP_IMGFLAG_PRESERVE, mpi->width, mpi->height);
-		
+
 	switch (p->analyze(p, mpi, dmpi)) {
 	case TC_DROP:
 		/* Don't copy anything unless we'll need to read it. */

Modified: trunk/libmpcodecs/vf_dvbscale.c
==============================================================================
--- trunk/libmpcodecs/vf_dvbscale.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_dvbscale.c	Wed May 13 04:58:57 2009	(r29305)
@@ -21,7 +21,7 @@ static int config(struct vf_instance_s* 
 	unsigned int flags, unsigned int outfmt){
 
     int scaled_y=vf->priv->aspect*d_height/d_width;
-    
+
     d_width=width; // do X-scaling by hardware
     d_height=scaled_y;
 

Modified: trunk/libmpcodecs/vf_eq.c
==============================================================================
--- trunk/libmpcodecs/vf_eq.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_eq.c	Wed May 13 04:58:57 2009	(r29305)
@@ -42,7 +42,7 @@ static void process_MMX(unsigned char *d
 
 	brvec[0] = brvec[1] = brvec[2] = brvec[3] = brightness;
 	contvec[0] = contvec[1] = contvec[2] = contvec[3] = contrast;
-		
+
 	while (h--) {
 		__asm__ volatile (
 			"movq (%5), %%mm3 \n\t"
@@ -121,7 +121,7 @@ static int put_image(struct vf_instance_
 	dmpi=vf_get_image(vf->next, mpi->imgfmt,
 			  MP_IMGTYPE_EXPORT, 0,
 			  mpi->w, mpi->h);
-	
+
 	dmpi->stride[0] = mpi->stride[0];
 	dmpi->planes[1] = mpi->planes[1];
 	dmpi->planes[2] = mpi->planes[2];
@@ -129,7 +129,7 @@ static int put_image(struct vf_instance_
 	dmpi->stride[2] = mpi->stride[2];
 
 	if (!vf->priv->buf) vf->priv->buf = malloc(mpi->stride[0]*mpi->h);
-	
+
 	if ((vf->priv->brightness == 0) && (vf->priv->contrast == 0))
 		dmpi->planes[0] = mpi->planes[0];
 	else {
@@ -207,7 +207,7 @@ static int open(vf_instance_t *vf, char*
 	vf->query_format=query_format;
 	vf->put_image=put_image;
 	vf->uninit=uninit;
-	
+
 	if(!vf->priv) {
 	vf->priv = malloc(sizeof(struct vf_priv_s));
 	memset(vf->priv, 0, sizeof(struct vf_priv_s));
@@ -218,7 +218,7 @@ static int open(vf_instance_t *vf, char*
 #if HAVE_MMX
 	if(gCpuCaps.hasMMX) process = process_MMX;
 #endif
-	
+
 	return 1;
 }
 

Modified: trunk/libmpcodecs/vf_eq2.c
==============================================================================
--- trunk/libmpcodecs/vf_eq2.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_eq2.c	Wed May 13 04:58:57 2009	(r29305)
@@ -117,7 +117,7 @@ void affine_1d_MMX (eq2_param_t *par, un
   int      pel;
   short    brvec[4];
   short    contvec[4];
-  
+
 //  printf("\nmmx: src=%p dst=%p w=%d h=%d ds=%d ss=%d\n",src,dst,w,h,dstride,sstride);
 
   contrast = (int) (par->c * 256 * 16);

Modified: trunk/libmpcodecs/vf_expand.c
==============================================================================
--- trunk/libmpcodecs/vf_expand.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_expand.c	Wed May 13 04:58:57 2009	(r29305)
@@ -252,8 +252,8 @@ static void get_image(struct vf_instance
        (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH)) ){
 	// try full DR !
 	mpi->priv=vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
-	    mpi->type, mpi->flags, 
-            MAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x), 
+	    mpi->type, mpi->flags,
+            MAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
             MAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
 #if 1
 	if((vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) &&
@@ -295,8 +295,8 @@ static void start_slice(struct vf_instan
     if(!mpi->priv)
 	mpi->priv=vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 //	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
-	    MP_IMGTYPE_TEMP, mpi->flags, 
-            MAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x), 
+	    MP_IMGTYPE_TEMP, mpi->flags,
+            MAX(vf->priv->exp_w, mpi->width +vf->priv->exp_x),
             MAX(vf->priv->exp_h, mpi->height+vf->priv->exp_y));
     if(!(vf->dmpi->flags&MP_IMGFLAG_DRAW_CALLBACK))
 	mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_WarnNextFilterDoesntSupportSlices); // shouldn't happen.
@@ -309,7 +309,7 @@ static void draw_top_blackbar_slice(stru
 	vf_next_draw_slice(vf, vf->dmpi->planes, vf->dmpi->stride,
 			   vf->dmpi->w,vf->priv->exp_y,0,0);
     }
-    
+
 }
 
 static void draw_bottom_blackbar_slice(struct vf_instance_s* vf,
@@ -335,7 +335,7 @@ static void draw_bottom_blackbar_slice(s
 static void draw_slice(struct vf_instance_s* vf,
         unsigned char** src, int* stride, int w,int h, int x, int y){
 //    printf("draw_slice() called %d at %d\n",h,y);
-    
+
     if (y == 0 && y+h == vf->h) {
 	// special case - only one slice
 	draw_top_blackbar_slice(vf, src, stride, w, h, x, y);
@@ -380,7 +380,7 @@ static int put_image(struct vf_instance_
     vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
 	vf->priv->exp_w, vf->priv->exp_h);
-    
+
     // copy mpi->dmpi...
     if(mpi->flags&MP_IMGFLAG_PLANAR){
 	memcpy_pic(vf->dmpi->planes[0]+

Modified: trunk/libmpcodecs/vf_field.c
==============================================================================
--- trunk/libmpcodecs/vf_field.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_field.c	Wed May 13 04:58:57 2009	(r29305)
@@ -24,7 +24,7 @@ static int put_image(struct vf_instance_
     vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 	MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE,
 	mpi->width, mpi->height/2);
-    
+
     // set up mpi as a double-stride image of dmpi:
     vf->dmpi->planes[0]=mpi->planes[0]+mpi->stride[0]*vf->priv->field;
     vf->dmpi->stride[0]=2*mpi->stride[0];
@@ -37,7 +37,7 @@ static int put_image(struct vf_instance_
 	vf->dmpi->stride[2]=2*mpi->stride[2];
     } else
 	vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!!
-    
+
     return vf_next_put_image(vf,vf->dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_fil.c
==============================================================================
--- trunk/libmpcodecs/vf_fil.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_fil.c	Wed May 13 04:58:57 2009	(r29305)
@@ -27,9 +27,9 @@ static int config(struct vf_instance_s* 
         pixel_stride= mpi->stride[0];
     else
         pixel_stride= 8*mpi->stride[0] / mpi->bpp;
-        
-#endif        
-    
+
+#endif
+
     if(vf->priv->interleave){
         vf->priv->height= 2*height;
         vf->priv->width= width - (pixel_stride/2);
@@ -54,7 +54,7 @@ static int put_image(struct vf_instance_
     vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 	MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE,
 	vf->priv->width, vf->priv->height);
-    
+
     // set up mpi as a double-stride image of dmpi:
     vf->dmpi->planes[0]=mpi->planes[0];
     vf->dmpi->stride[0]=(mpi->stride[0]*vf->priv->stridefactor)>>1;
@@ -65,7 +65,7 @@ static int put_image(struct vf_instance_
 	vf->dmpi->stride[2]=(mpi->stride[2]*vf->priv->stridefactor)>>1;
     } else
 	vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!!
-    
+
     return vf_next_put_image(vf,vf->dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_filmdint.c
==============================================================================
--- trunk/libmpcodecs/vf_filmdint.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_filmdint.c	Wed May 13 04:58:57 2009	(r29305)
@@ -245,7 +245,7 @@ get_metrics_faster_c(unsigned char *a, u
 	a += 2*as;
 	b += 2*bs;
     } while (--lines);
-    
+
 }
 
 static inline void

Modified: trunk/libmpcodecs/vf_flip.c
==============================================================================
--- trunk/libmpcodecs/vf_flip.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_flip.c	Wed May 13 04:58:57 2009	(r29305)
@@ -52,7 +52,7 @@ static int put_image(struct vf_instance_
     vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 	MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE,
 	mpi->width, mpi->height);
-    
+
     // set up mpi as a upside-down image of dmpi:
     vf->dmpi->planes[0]=mpi->planes[0]+
 		    mpi->stride[0]*(mpi->height-1);
@@ -66,7 +66,7 @@ static int put_image(struct vf_instance_
 	vf->dmpi->stride[2]=-mpi->stride[2];
     } else
 	vf->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!!
-    
+
     return vf_next_put_image(vf,vf->dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_format.c
==============================================================================
--- trunk/libmpcodecs/vf_format.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_format.c	Wed May 13 04:58:57 2009	(r29305)
@@ -68,7 +68,7 @@ static int open(vf_instance_t *vf, char*
 	if(!strcasecmp(args,"abgr")) vf->priv->fmt=IMGFMT_ABGR; else
 	{ mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_UnknownFormatName, args);return 0;}
     }
-        
+
 
     return 1;
 }

Modified: trunk/libmpcodecs/vf_fspp.c
==============================================================================
--- trunk/libmpcodecs/vf_fspp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_fspp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -21,7 +21,7 @@
 
 /*
  * This implementation is based on an algorithm described in
- * "Aria Nosratinia Embedded Post-Processing for 
+ * "Aria Nosratinia Embedded Post-Processing for
  * Enhancement of Compressed Images (1999)"
  * (http://citeseer.nj.nec.com/nosratinia99embedded.html)
  * Futher, with splitting (i)dct into hor/ver passes, one of them can be
@@ -31,7 +31,7 @@
 /*
   Heavily optimized version of SPP filter by Nikolaj
  */
- 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -110,7 +110,7 @@ static void store_slice_c(uint8_t *dst, 
     src[x + pos]=src[x + pos - 8*src_stride]=0;				\
     if(temp & 0x100) temp= ~(temp>>31);					\
     dst[x + pos]= temp;
-    
+
     for(y=0; y<height; y++){
 	const uint8_t *d= dither[y];
 	for(x=0; x<width; x+=8){
@@ -122,7 +122,7 @@ static void store_slice_c(uint8_t *dst, 
 	    STORE(4);
 	    STORE(5);
 	    STORE(6);
-	    STORE(7);      
+	    STORE(7);
 	}
 	src+=src_stride;
 	dst+=dst_stride;
@@ -137,7 +137,7 @@ static void store_slice2_c(uint8_t *dst,
     src[x + pos + 16*src_stride]=0;					\
     if(temp & 0x100) temp= ~(temp>>31);					\
     dst[x + pos]= temp;
-   
+
     for(y=0; y<height; y++){
 	const uint8_t *d= dither[y];
 	for(x=0; x<width; x+=8){
@@ -149,7 +149,7 @@ static void store_slice2_c(uint8_t *dst,
 	    STORE2(4);
 	    STORE2(5);
 	    STORE2(6);
-	    STORE2(7);      
+	    STORE2(7);
 	}
 	src+=src_stride;
 	dst+=dst_stride;
@@ -243,7 +243,7 @@ static void store_slice_mmx(uint8_t *dst
 	: "m" (width), "m" (src_stride), "g" (od), "m" (dst_stride), "g" (end),
 	  "m" (log2_scale), "m" (src), "m" (dst) //input
 	: "%"REG_a, "%"REG_c, "%"REG_d, "%"REG_S, "%"REG_D
-	);    
+	);
 }
 
 //This func reads from 2 slices, 0 & 2  and clears 2-nd
@@ -311,7 +311,7 @@ static void store_slice2_mmx(uint8_t *ds
 	: "m" (width), "m" (src_stride), "g" (od), "m" (dst_stride), "g" (end),
 	  "m" (log2_scale), "m" (src), "m" (dst) //input
 	: "%"REG_a, "%"REG_c, "%"REG_d, "%"REG_D, "%"REG_S
-	);  
+	);
 }
 
 static void mul_thrmat_mmx(struct vf_priv_s *p, int q)
@@ -393,7 +393,7 @@ static void mul_thrmat_mmx(struct vf_pri
 }
 
 static void column_fidct_mmx(int16_t* thr_adr,  DCTELEM *data,  DCTELEM *output,  int cnt);
-static void row_idct_mmx(DCTELEM* workspace, 
+static void row_idct_mmx(DCTELEM* workspace,
 			 int16_t* output_adr,  int output_stride,  int cnt);
 static void row_fdct_mmx(DCTELEM *data,  const uint8_t *pixels,  int line_size,  int cnt);
 
@@ -413,19 +413,19 @@ static void filter(struct vf_priv_s *p, 
     int x, x0, y, es, qy, t;
     const int stride= is_luma ? p->temp_stride : (width+16);//((width+16+15)&(~15))
     const int step=6-p->log2_count;
-    const int qps= 3 + is_luma; 
+    const int qps= 3 + is_luma;
     int32_t __attribute__((aligned(32))) block_align[4*8*BLOCKSZ+ 4*8*BLOCKSZ];
     DCTELEM *block= (DCTELEM *)block_align;
-    DCTELEM *block3=(DCTELEM *)(block_align+4*8*BLOCKSZ);    
+    DCTELEM *block3=(DCTELEM *)(block_align+4*8*BLOCKSZ);
 
     memset(block3, 0, 4*8*BLOCKSZ);
 
-    //p->src=src-src_stride*8-8;//!    
+    //p->src=src-src_stride*8-8;//!
     if (!src || !dst) return; // HACK avoid crash for Y8 colourspace
     for(y=0; y<height; y++){
         int index= 8 + 8*stride + y*stride;
         fast_memcpy(p->src + index, src + y*src_stride, width);//this line can be avoided by using DR & user fr.buffers
-        for(x=0; x<8; x++){ 
+        for(x=0; x<8; x++){
             p->src[index         - x - 1]= p->src[index +         x    ];
             p->src[index + width + x    ]= p->src[index + width - x - 1];
         }
@@ -447,11 +447,11 @@ static void filter(struct vf_priv_s *p, 
 	row_fdct_s(block, p->src + y*stride +2-(y&1), stride, 2);
 	for(x0=0; x0<width+8-8*(BLOCKSZ-1); x0+=8*(BLOCKSZ-1)){
 	    row_fdct_s(block+8*8, p->src + y*stride+8+x0 +2-(y&1), stride, 2*(BLOCKSZ-1));
-	    if(p->qp)        
+	    if(p->qp)
 		column_fidct_s((int16_t*)(&p->threshold_mtx[0]), block+0*8, block3+0*8, 8*(BLOCKSZ-1)); //yes, this is a HOTSPOT
 	    else
 		for (x=0; x<8*(BLOCKSZ-1); x+=8) {
-		    t=x+x0-2; //correct t=x+x0-2-(y&1), but its the same 
+		    t=x+x0-2; //correct t=x+x0-2-(y&1), but its the same
 		    if (t<0) t=0;//t always < width-2
 		    t=qp_store[qy+(t>>qps)];
 		    if(p->mpeg2) t>>=1; //copy p->mpeg2,prev_q to locals?
@@ -463,24 +463,24 @@ static void filter(struct vf_priv_s *p, 
 	    memmove(block3, block3+(BLOCKSZ-1)*64, 6*8*sizeof(DCTELEM));
 	}
 	//
-	es=width+8-x0; //  8, ...      
+	es=width+8-x0; //  8, ...
 	if (es>8)
 	    row_fdct_s(block+8*8, p->src + y*stride+8+x0 +2-(y&1), stride, (es-4)>>2);
 	column_fidct_s((int16_t*)(&p->threshold_mtx[0]), block, block3, es&(~1));
 	row_idct_s(block3+0*8, p->temp + (y&15)*stride+x0+2-(y&1), stride, es>>2);
 	{const int y1=y-8+step;//l5-7  l4-6
 	    if (!(y1&7) && y1) {
-		if (y1&8) store_slice_s(dst + (y1-8)*dst_stride, p->temp+ 8 +8*stride, 
+		if (y1&8) store_slice_s(dst + (y1-8)*dst_stride, p->temp+ 8 +8*stride,
 					dst_stride, stride, width, 8, 5-p->log2_count);
-		else store_slice2_s(dst + (y1-8)*dst_stride, p->temp+ 8 +0*stride, 
-				    dst_stride, stride, width, 8, 5-p->log2_count);    
+		else store_slice2_s(dst + (y1-8)*dst_stride, p->temp+ 8 +0*stride,
+				    dst_stride, stride, width, 8, 5-p->log2_count);
 	    } }
     }
 
     if (y&7) {  // == height & 7
-	if (y&8) store_slice_s(dst + ((y-8)&~7)*dst_stride, p->temp+ 8 +8*stride, 
+	if (y&8) store_slice_s(dst + ((y-8)&~7)*dst_stride, p->temp+ 8 +8*stride,
 			       dst_stride, stride, width, y&7, 5-p->log2_count);
-	else store_slice2_s(dst + ((y-8)&~7)*dst_stride, p->temp+ 8 +0*stride, 
+	else store_slice2_s(dst + ((y-8)&~7)*dst_stride, p->temp+ 8 +0*stride,
 			    dst_stride, stride, width, y&7, 5-p->log2_count);
     }
 }
@@ -577,7 +577,7 @@ static void uninit(struct vf_instance_s*
     //vf->priv->avctx= NULL;
     if(vf->priv->non_b_qp) free(vf->priv->non_b_qp);
     vf->priv->non_b_qp= NULL;
-        
+
     av_free(vf->priv);
     vf->priv=NULL;
 }
@@ -621,23 +621,23 @@ static int open(vf_instance_t *vf, char*
     int i=0, bias;
     int custom_threshold_m[64];
     int log2c=-1;
-    
+
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
     vf->query_format=query_format;
     vf->uninit=uninit;
     vf->control= control;
-    vf->priv=av_mallocz(sizeof(struct vf_priv_s));//assumes align 16 ! 
-    
+    vf->priv=av_mallocz(sizeof(struct vf_priv_s));//assumes align 16 !
+
     avcodec_init();
 
     //vf->priv->avctx= avcodec_alloc_context();
     //dsputil_init(&vf->priv->dsp, vf->priv->avctx);
-    
+
     vf->priv->log2_count= 4;
     vf->priv->bframes = 0;
-    
+
     if (args) sscanf(args, "%d:%d:%d:%d", &log2c, &vf->priv->qp, &i, &vf->priv->bframes);
 
     if( log2c >=4 && log2c <=5 )
@@ -650,7 +650,7 @@ static int open(vf_instance_t *vf, char*
 
     if (i < -15) i = -15;
     if (i > 32) i = 32;
-    
+
     bias= (1<<4)+i; //regulable
     vf->priv->prev_q=0;
     //
@@ -702,21 +702,21 @@ const vf_info_t vf_info_fspp = {
 
 #if HAVE_MMX
 
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_382683433)=FIX64(0.382683433, 14); 
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_541196100)=FIX64(0.541196100, 14); 
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_707106781)=FIX64(0.707106781, 14); 
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_1_306562965)=FIX64(1.306562965, 14); 
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_382683433)=FIX64(0.382683433, 14);
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_541196100)=FIX64(0.541196100, 14);
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_707106781)=FIX64(0.707106781, 14);
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_1_306562965)=FIX64(1.306562965, 14);
 
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_1_414213562_A)=FIX64(1.414213562, 14); 
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_1_414213562_A)=FIX64(1.414213562, 14);
 
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_1_847759065)=FIX64(1.847759065, 13); 
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_1_847759065)=FIX64(1.847759065, 13);
 DECLARE_ASM_CONST(8, uint64_t, MM_FIX_2_613125930)=FIX64(-2.613125930, 13); //-
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_1_414213562)=FIX64(1.414213562, 13); 
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_1_414213562)=FIX64(1.414213562, 13);
 DECLARE_ASM_CONST(8, uint64_t, MM_FIX_1_082392200)=FIX64(1.082392200, 13);
 //for t3,t5,t7 == 0 shortcut
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_847759065)=FIX64(0.847759065, 14); 
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_566454497)=FIX64(0.566454497, 14); 
-DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_198912367)=FIX64(0.198912367, 14); 
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_847759065)=FIX64(0.847759065, 14);
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_566454497)=FIX64(0.566454497, 14);
+DECLARE_ASM_CONST(8, uint64_t, MM_FIX_0_198912367)=FIX64(0.198912367, 14);
 
 DECLARE_ASM_CONST(8, uint64_t, MM_DESCALE_RND)=C64(4);
 DECLARE_ASM_CONST(8, uint64_t, MM_2)=C64(2);
@@ -724,14 +724,14 @@ DECLARE_ASM_CONST(8, uint64_t, MM_2)=C64
 #else /* !HAVE_MMX */
 
 typedef int32_t int_simd16_t;
-static const int16_t FIX_0_382683433=FIX(0.382683433, 14); 
-static const int16_t FIX_0_541196100=FIX(0.541196100, 14); 
-static const int16_t FIX_0_707106781=FIX(0.707106781, 14); 
-static const int16_t FIX_1_306562965=FIX(1.306562965, 14); 
-static const int16_t FIX_1_414213562_A=FIX(1.414213562, 14); 
-static const int16_t FIX_1_847759065=FIX(1.847759065, 13); 
+static const int16_t FIX_0_382683433=FIX(0.382683433, 14);
+static const int16_t FIX_0_541196100=FIX(0.541196100, 14);
+static const int16_t FIX_0_707106781=FIX(0.707106781, 14);
+static const int16_t FIX_1_306562965=FIX(1.306562965, 14);
+static const int16_t FIX_1_414213562_A=FIX(1.414213562, 14);
+static const int16_t FIX_1_847759065=FIX(1.847759065, 13);
 static const int16_t FIX_2_613125930=FIX(-2.613125930, 13); //-
-static const int16_t FIX_1_414213562=FIX(1.414213562, 13); 
+static const int16_t FIX_1_414213562=FIX(1.414213562, 13);
 static const int16_t FIX_1_082392200=FIX(1.082392200, 13);
 
 #endif
@@ -749,46 +749,46 @@ static void column_fidct_c(int16_t* thr_
     DCTELEM* wsptr;
     int16_t *threshold;
     int ctr;
-  
+
     dataptr = data;
     wsptr = output;
 
     for (; cnt > 0; cnt-=2) { //start positions
 	threshold=(int16_t*)thr_adr;//threshold_mtx
-	for (ctr = DCTSIZE; ctr > 0; ctr--) { 
-	    // Process columns from input, add to output. 
+	for (ctr = DCTSIZE; ctr > 0; ctr--) {
+	    // Process columns from input, add to output.
 	    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
 	    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
-    
+
 	    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
 	    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
-    
+
 	    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
 	    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
-    
+
 	    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
 	    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
 
 	    // Even part of FDCT
-    
+
 	    tmp10 = tmp0 + tmp3;
 	    tmp13 = tmp0 - tmp3;
 	    tmp11 = tmp1 + tmp2;
 	    tmp12 = tmp1 - tmp2;
 
-	    d0 = tmp10 + tmp11; 
+	    d0 = tmp10 + tmp11;
 	    d4 = tmp10 - tmp11;
-    
-	    z1 = MULTIPLY16H((tmp12 + tmp13) <<2, FIX_0_707106781); 
-	    d2 = tmp13 + z1; 
-	    d6 = tmp13 - z1;    
+
+	    z1 = MULTIPLY16H((tmp12 + tmp13) <<2, FIX_0_707106781);
+	    d2 = tmp13 + z1;
+	    d6 = tmp13 - z1;
 
 	    // Even part of IDCT
 
 	    THRESHOLD(tmp0, d0, threshold[0*8]);
 	    THRESHOLD(tmp1, d2, threshold[2*8]);
 	    THRESHOLD(tmp2, d4, threshold[4*8]);
-	    THRESHOLD(tmp3, d6, threshold[6*8]);     
+	    THRESHOLD(tmp3, d6, threshold[6*8]);
 	    tmp0+=2;
 	    tmp10 = (tmp0 + tmp2)>>2;
 	    tmp11 = (tmp0 - tmp2)>>2;
@@ -803,22 +803,22 @@ static void column_fidct_c(int16_t* thr_
 
 	    // Odd part of FDCT
 
-	    tmp10 = tmp4 + tmp5;  
+	    tmp10 = tmp4 + tmp5;
 	    tmp11 = tmp5 + tmp6;
 	    tmp12 = tmp6 + tmp7;
-        
-	    z5 = MULTIPLY16H((tmp10 - tmp12)<<2, FIX_0_382683433); 
-	    z2 = MULTIPLY16H(tmp10 <<2, FIX_0_541196100) + z5; 
-	    z4 = MULTIPLY16H(tmp12 <<2, FIX_1_306562965) + z5; 
-	    z3 = MULTIPLY16H(tmp11 <<2, FIX_0_707106781); 
 
-	    z11 = tmp7 + z3;        
+	    z5 = MULTIPLY16H((tmp10 - tmp12)<<2, FIX_0_382683433);
+	    z2 = MULTIPLY16H(tmp10 <<2, FIX_0_541196100) + z5;
+	    z4 = MULTIPLY16H(tmp12 <<2, FIX_1_306562965) + z5;
+	    z3 = MULTIPLY16H(tmp11 <<2, FIX_0_707106781);
+
+	    z11 = tmp7 + z3;
 	    z13 = tmp7 - z3;
 
-	    d5 = z13 + z2; 
+	    d5 = z13 + z2;
 	    d3 = z13 - z2;
 	    d1 = z11 + z4;
-	    d7 = z11 - z4;    
+	    d7 = z11 - z4;
 
 	    // Odd part of IDCT
 
@@ -857,7 +857,7 @@ static void column_fidct_c(int16_t* thr_
 	    threshold++;
 	}
 	dataptr+=8; //skip each second start pos
-	wsptr  +=8;       
+	wsptr  +=8;
     }
 }
 
@@ -874,7 +874,7 @@ static void column_fidct_mmx(int16_t* th
 	"movq "DCTSIZE_S"*3*2(%%"REG_S"), %%mm7 \n\t"
 	"movq %%mm1, %%mm0             \n\t"
 
-	"paddw "DCTSIZE_S"*7*2(%%"REG_S"), %%mm1 \n\t" //t0    
+	"paddw "DCTSIZE_S"*7*2(%%"REG_S"), %%mm1 \n\t" //t0
 	"movq %%mm7, %%mm3             \n\t"
 
 	"paddw "DCTSIZE_S"*4*2(%%"REG_S"), %%mm7 \n\t" //t3
@@ -892,13 +892,13 @@ static void column_fidct_mmx(int16_t* th
 	"paddw "DCTSIZE_S"*5*2(%%"REG_S"), %%mm2 \n\t" //t2
 	"movq %%mm6, %%mm7             \n\t"
 
-	"paddw %%mm2, %%mm6            \n\t" //t11    
+	"paddw %%mm2, %%mm6            \n\t" //t11
 	"psubw %%mm2, %%mm7            \n\t" //t12
 
 	"movq %%mm5, %%mm2             \n\t"
 	"paddw %%mm6, %%mm5            \n\t" //d0
 	// i0 t13 t12 i3 i1 d0 - d4
-	"psubw %%mm6, %%mm2            \n\t" //d4      
+	"psubw %%mm6, %%mm2            \n\t" //d4
 	"paddw %%mm1, %%mm7            \n\t"
 
 	"movq  4*16(%%"REG_d"), %%mm6      \n\t"
@@ -938,7 +938,7 @@ static void column_fidct_mmx(int16_t* th
 
 	"paddusw 2*16(%%"REG_d"), %%mm1    \n\t"
 	"psubw %%mm7, %%mm6            \n\t"
-	// t7 d2 /t11 t4 t6 - d6 /t10     
+	// t7 d2 /t11 t4 t6 - d6 /t10
 
 	"paddw 2*16(%%"REG_d"), %%mm1      \n\t"
 	"paddusw %%mm7, %%mm6          \n\t"
@@ -950,7 +950,7 @@ static void column_fidct_mmx(int16_t* th
 	"psubusw %%mm7, %%mm6          \n\t"
 
 	//movq [edi+"DCTSIZE_S"*2*2], mm1
-	//movq [edi+"DCTSIZE_S"*6*2], mm6     
+	//movq [edi+"DCTSIZE_S"*6*2], mm6
 	"movq %%mm1, %%mm7             \n\t"
 	"psraw $2, %%mm2              \n\t"
 
@@ -970,7 +970,7 @@ static void column_fidct_mmx(int16_t* th
 	"psubw %%mm6, %%mm7            \n\t" //'t3
 
 	"movq "DCTSIZE_S"*2*2(%%"REG_S"), %%mm2 \n\t"
-	"psubw %%mm6, %%mm1            \n\t" //'t12        
+	"psubw %%mm6, %%mm1            \n\t" //'t12
 
 	"psubw "DCTSIZE_S"*5*2(%%"REG_S"), %%mm2 \n\t" //t5
 	"movq %%mm5, %%mm6             \n\t"
@@ -1000,7 +1000,7 @@ static void column_fidct_mmx(int16_t* th
 	"psubw %%mm1, %%mm6            \n\t" //'t2
 	// t7 't12 't11 t4 t6 - 't13 't10   ---
 
-	"paddw %%mm3, %%mm7            \n\t" //z2        
+	"paddw %%mm3, %%mm7            \n\t" //z2
 
 	"movq %%mm5, 1*8+%3            \n\t"
 	"paddw %%mm3, %%mm4            \n\t" //z4
@@ -1009,10 +1009,10 @@ static void column_fidct_mmx(int16_t* th
 	"movq %%mm0, %%mm1             \n\t"
 
 	"movq %%mm6, 2*8+%3            \n\t"
-	"psubw %%mm2, %%mm1            \n\t" //z13            
+	"psubw %%mm2, %%mm1            \n\t" //z13
 
 //===
-	"paddw %%mm2, %%mm0            \n\t" //z11 
+	"paddw %%mm2, %%mm0            \n\t" //z11
 	"movq %%mm1, %%mm5             \n\t"
 
 	"movq 5*16(%%"REG_d"), %%mm2       \n\t"
@@ -1025,12 +1025,12 @@ static void column_fidct_mmx(int16_t* th
 	"psubw %%mm2, %%mm5            \n\t"
 
 	"movq %%mm0, %%mm6             \n\t"
-	"paddw %%mm4, %%mm0            \n\t" //d1    
+	"paddw %%mm4, %%mm0            \n\t" //d1
 
 	"paddusw %%mm3, %%mm1          \n\t"
-	"psubw %%mm4, %%mm6            \n\t" //d7  
+	"psubw %%mm4, %%mm6            \n\t" //d7
 
-	// d1 d3 - - - d5 d7 -    
+	// d1 d3 - - - d5 d7 -
 	"movq 7*16(%%"REG_d"), %%mm4       \n\t"
 	"psubw %%mm7, %%mm0            \n\t"
 
@@ -1082,7 +1082,7 @@ static void column_fidct_mmx(int16_t* th
 
 	"movq 1*8+%3, %%mm6            \n\t"
 	//paddw mm3, MM_2
-	"psraw $2, %%mm3              \n\t" //tmp7     
+	"psraw $2, %%mm3              \n\t" //tmp7
 
 	"pmulhw "MANGLE(MM_FIX_0_198912367)", %%mm2 \n\t" //-tmp4
 	"psubw %%mm3, %%mm4            \n\t"
@@ -1135,7 +1135,7 @@ static void column_fidct_mmx(int16_t* th
 	"2:                    \n\t"
 	//--- non DC2
 	//psraw mm1, 2 w/o it -> offset. thr1, thr1, thr1  (actually thr1, thr1, thr1-1)
-	//psraw mm5, 2              
+	//psraw mm5, 2
 	//psraw mm0, 2
 	//psraw mm6, 2
 	"movq %%mm5, %%mm3             \n\t"
@@ -1205,7 +1205,7 @@ static void column_fidct_mmx(int16_t* th
 	"paddw %%mm2, %%mm7            \n\t"
 
 	"movq %%mm3, "DCTSIZE_S"*1*2(%%"REG_D") \n\t"
-	"paddw %%mm2, %%mm0            \n\t" //'t4     
+	"paddw %%mm2, %%mm0            \n\t" //'t4
 
 	// 't4 't6 't5 - - - - 't7
 	"movq %%mm7, "DCTSIZE_S"*2*2(%%"REG_D") \n\t"
@@ -1226,13 +1226,13 @@ static void column_fidct_mmx(int16_t* th
 	"add $8, %%"REG_D"               \n\t"
 
 	"4:                     \n\t"
-//=part 2 (the same)===========================================================    
+//=part 2 (the same)===========================================================
 	"movq "DCTSIZE_S"*0*2(%%"REG_S"), %%mm1 \n\t"
 	//
 	"movq "DCTSIZE_S"*3*2(%%"REG_S"), %%mm7 \n\t"
 	"movq %%mm1, %%mm0             \n\t"
 
-	"paddw "DCTSIZE_S"*7*2(%%"REG_S"), %%mm1 \n\t" //t0    
+	"paddw "DCTSIZE_S"*7*2(%%"REG_S"), %%mm1 \n\t" //t0
 	"movq %%mm7, %%mm3             \n\t"
 
 	"paddw "DCTSIZE_S"*4*2(%%"REG_S"), %%mm7 \n\t" //t3
@@ -1250,13 +1250,13 @@ static void column_fidct_mmx(int16_t* th
 	"paddw "DCTSIZE_S"*5*2(%%"REG_S"), %%mm2 \n\t" //t2
 	"movq %%mm6, %%mm7             \n\t"
 
-	"paddw %%mm2, %%mm6            \n\t" //t11    
+	"paddw %%mm2, %%mm6            \n\t" //t11
 	"psubw %%mm2, %%mm7            \n\t" //t12
 
 	"movq %%mm5, %%mm2             \n\t"
 	"paddw %%mm6, %%mm5            \n\t" //d0
 	// i0 t13 t12 i3 i1 d0 - d4
-	"psubw %%mm6, %%mm2            \n\t" //d4      
+	"psubw %%mm6, %%mm2            \n\t" //d4
 	"paddw %%mm1, %%mm7            \n\t"
 
 	"movq  1*8+4*16(%%"REG_d"), %%mm6  \n\t"
@@ -1296,7 +1296,7 @@ static void column_fidct_mmx(int16_t* th
 
 	"paddusw 1*8+2*16(%%"REG_d"), %%mm1 \n\t"
 	"psubw %%mm7, %%mm6            \n\t"
-	// t7 d2 /t11 t4 t6 - d6 /t10     
+	// t7 d2 /t11 t4 t6 - d6 /t10
 
 	"paddw 1*8+2*16(%%"REG_d"), %%mm1  \n\t"
 	"paddusw %%mm7, %%mm6          \n\t"
@@ -1308,7 +1308,7 @@ static void column_fidct_mmx(int16_t* th
 	"psubusw %%mm7, %%mm6          \n\t"
 
 	//movq [edi+"DCTSIZE_S"*2*2], mm1
-	//movq [edi+"DCTSIZE_S"*6*2], mm6     
+	//movq [edi+"DCTSIZE_S"*6*2], mm6
 	"movq %%mm1, %%mm7             \n\t"
 	"psraw $2, %%mm2              \n\t"
 
@@ -1328,7 +1328,7 @@ static void column_fidct_mmx(int16_t* th
 	"psubw %%mm6, %%mm7            \n\t" //'t3
 
 	"movq "DCTSIZE_S"*2*2(%%"REG_S"), %%mm2 \n\t"
-	"psubw %%mm6, %%mm1            \n\t" //'t12        
+	"psubw %%mm6, %%mm1            \n\t" //'t12
 
 	"psubw "DCTSIZE_S"*5*2(%%"REG_S"), %%mm2 \n\t" //t5
 	"movq %%mm5, %%mm6             \n\t"
@@ -1358,7 +1358,7 @@ static void column_fidct_mmx(int16_t* th
 	"psubw %%mm1, %%mm6            \n\t" //'t2
 	// t7 't12 't11 t4 t6 - 't13 't10   ---
 
-	"paddw %%mm3, %%mm7            \n\t" //z2        
+	"paddw %%mm3, %%mm7            \n\t" //z2
 
 	"movq %%mm5, 1*8+%3            \n\t"
 	"paddw %%mm3, %%mm4            \n\t" //z4
@@ -1367,10 +1367,10 @@ static void column_fidct_mmx(int16_t* th
 	"movq %%mm0, %%mm1             \n\t"
 
 	"movq %%mm6, 2*8+%3            \n\t"
-	"psubw %%mm2, %%mm1            \n\t" //z13            
+	"psubw %%mm2, %%mm1            \n\t" //z13
 
 //===
-	"paddw %%mm2, %%mm0            \n\t" //z11 
+	"paddw %%mm2, %%mm0            \n\t" //z11
 	"movq %%mm1, %%mm5             \n\t"
 
 	"movq 1*8+5*16(%%"REG_d"), %%mm2   \n\t"
@@ -1383,12 +1383,12 @@ static void column_fidct_mmx(int16_t* th
 	"psubw %%mm2, %%mm5            \n\t"
 
 	"movq %%mm0, %%mm6             \n\t"
-	"paddw %%mm4, %%mm0            \n\t" //d1    
+	"paddw %%mm4, %%mm0            \n\t" //d1
 
 	"paddusw %%mm3, %%mm1          \n\t"
-	"psubw %%mm4, %%mm6            \n\t" //d7  
+	"psubw %%mm4, %%mm6            \n\t" //d7
 
-	// d1 d3 - - - d5 d7 -    
+	// d1 d3 - - - d5 d7 -
 	"movq 1*8+7*16(%%"REG_d"), %%mm4   \n\t"
 	"psubw %%mm7, %%mm0            \n\t"
 
@@ -1440,7 +1440,7 @@ static void column_fidct_mmx(int16_t* th
 
 	"movq 1*8+%3, %%mm6            \n\t"
 	//paddw mm3, MM_2
-	"psraw $2, %%mm3              \n\t" //tmp7     
+	"psraw $2, %%mm3              \n\t" //tmp7
 
 	"pmulhw "MANGLE(MM_FIX_0_198912367)", %%mm2 \n\t" //-tmp4
 	"psubw %%mm3, %%mm4            \n\t"
@@ -1495,7 +1495,7 @@ static void column_fidct_mmx(int16_t* th
 	"3:                    \n\t"
 	//--- non DC2
 	//psraw mm1, 2 w/o it -> offset. thr1, thr1, thr1  (actually thr1, thr1, thr1-1)
-	//psraw mm5, 2              
+	//psraw mm5, 2
 	//psraw mm0, 2
 	//psraw mm6, 2
 	"movq %%mm5, %%mm3             \n\t"
@@ -1565,7 +1565,7 @@ static void column_fidct_mmx(int16_t* th
 	"paddw %%mm2, %%mm7            \n\t"
 
 	"movq %%mm3, "DCTSIZE_S"*1*2(%%"REG_D") \n\t"
-	"paddw %%mm2, %%mm0            \n\t" //'t4     
+	"paddw %%mm2, %%mm0            \n\t" //'t4
 
 	// 't4 't6 't5 - - - - 't7
 	"movq %%mm7, "DCTSIZE_S"*2*2(%%"REG_D") \n\t"
@@ -1606,13 +1606,13 @@ static void row_idct_c(DCTELEM* workspac
     int_simd16_t z5, z10, z11, z12, z13;
     int16_t* outptr;
     DCTELEM* wsptr;
-    
+
     cnt*=4;
     wsptr = workspace;
     outptr = output_adr;
-    for (; cnt > 0; cnt--) {    
-	// Even part 
-	//Simd version reads 4x4 block and transposes it    
+    for (; cnt > 0; cnt--) {
+	// Even part
+	//Simd version reads 4x4 block and transposes it
 	tmp10 = ( wsptr[2] +  wsptr[3]);
 	tmp11 = ( wsptr[2] -  wsptr[3]);
 
@@ -1624,7 +1624,7 @@ static void row_idct_c(DCTELEM* workspac
 	tmp1 = tmp11 + tmp12;
 	tmp2 = tmp11 - tmp12;
 
-	// Odd part 
+	// Odd part
 	//Also transpose, with previous:
 	// ---- ----      ||||
 	// ---- ---- idct ||||
@@ -1635,7 +1635,7 @@ static void row_idct_c(DCTELEM* workspac
 	z11 = wsptr[6] + wsptr[7];
 	z12 = wsptr[6] - wsptr[7];
 
-	tmp7 = z11 + z13;   
+	tmp7 = z11 + z13;
 	tmp11 = MULTIPLY16H(z11 - z13, FIX_1_414213562);
 
 	z5 =    MULTIPLY16H(z10 + z12, FIX_1_847759065);
@@ -1657,13 +1657,13 @@ static void row_idct_c(DCTELEM* workspac
 	outptr[7*output_stride]+= DESCALE(tmp0 - tmp7, 3); //no += ?
 	outptr++;
 
-	wsptr += DCTSIZE;       // advance pointer to next row     
+	wsptr += DCTSIZE;       // advance pointer to next row
     }
 }
 
 #else /* HAVE_MMX */
 
-static void row_idct_mmx (DCTELEM* workspace, 
+static void row_idct_mmx (DCTELEM* workspace,
 			  int16_t* output_adr,  int output_stride,  int cnt)
 {
     uint64_t __attribute__((aligned(8))) temps[4];
@@ -1728,14 +1728,14 @@ static void row_idct_mmx (DCTELEM* works
 	"movq %%mm6, 1*8+%3            \n\t" //t3
 	"punpcklwd %%mm2, %%mm3        \n\t"
 
-	//transpose 4x4    
+	//transpose 4x4
 	"movq "DCTSIZE_S"*3*2+"DCTSIZE_S"(%%"REG_S"), %%mm6 \n\t"
 	"punpckhwd %%mm2, %%mm4        \n\t"
 
 	"movq %%mm5, %%mm2             \n\t"
 	"punpcklwd %%mm6, %%mm5        \n\t"
 
-	"psubw %%mm0, %%mm7            \n\t" //t2    
+	"psubw %%mm0, %%mm7            \n\t" //t2
 	"punpckhwd %%mm6, %%mm2        \n\t"
 
 	"movq %%mm3, %%mm0             \n\t"
@@ -1749,13 +1749,13 @@ static void row_idct_mmx (DCTELEM* works
 	"punpckldq %%mm2, %%mm4        \n\t" //6
 
 	"psubw %%mm0, %%mm3            \n\t" //z10
-	"punpckhdq %%mm2, %%mm5        \n\t" //7     
+	"punpckhdq %%mm2, %%mm5        \n\t" //7
 
 	"paddw %%mm0, %%mm6            \n\t" //z13
 	"movq %%mm4, %%mm2             \n\t"
 
 	"movq %%mm3, %%mm0             \n\t"
-	"psubw %%mm5, %%mm4            \n\t" //z12    
+	"psubw %%mm5, %%mm4            \n\t" //z12
 
 	"pmulhw "MANGLE(MM_FIX_2_613125930)", %%mm0 \n\t" //-
 	"paddw %%mm4, %%mm3            \n\t"
@@ -1769,11 +1769,11 @@ static void row_idct_mmx (DCTELEM* works
 	"psubw %%mm6, %%mm2            \n\t"
 	"paddw %%mm6, %%mm5            \n\t" //t7
 
-	"pmulhw "MANGLE(MM_FIX_1_414213562)", %%mm2 \n\t" //t11    
+	"pmulhw "MANGLE(MM_FIX_1_414213562)", %%mm2 \n\t" //t11
 	"paddw %%mm3, %%mm0            \n\t" //t12
 
 	"psllw $3, %%mm0              \n\t"
-	"psubw %%mm3, %%mm4            \n\t" //t10    
+	"psubw %%mm3, %%mm4            \n\t" //t10
 
 	"movq 0*8+%3, %%mm6            \n\t"
 	"movq %%mm1, %%mm3             \n\t"
@@ -1785,7 +1785,7 @@ static void row_idct_mmx (DCTELEM* works
 	"paddw %%mm0, %%mm1            \n\t" //d1
 
 	"psubw %%mm0, %%mm2            \n\t" //t5
-	"psubw %%mm0, %%mm3            \n\t" //d6         
+	"psubw %%mm0, %%mm3            \n\t" //d6
 
 	"paddw %%mm2, %%mm4            \n\t" //t4
 	"movq %%mm7, %%mm0             \n\t"
@@ -1832,7 +1832,7 @@ static void row_idct_mmx (DCTELEM* works
 	"paddw (%%"REG_D",%%"REG_d",), %%mm3    \n\t"
 	"psraw $3, %%mm6              \n\t"
 
-	"paddw 1*8+%3, %%mm4           \n\t" //d4        
+	"paddw 1*8+%3, %%mm4           \n\t" //d4
 	"paddw %%mm2, %%mm5            \n\t"
 
 	"paddw (%%"REG_D",%%"REG_a",4), %%mm6   \n\t"
@@ -1872,13 +1872,13 @@ static void row_fdct_c(DCTELEM *data, co
     int_simd16_t tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
     int_simd16_t tmp10, tmp11, tmp12, tmp13;
     int_simd16_t z1, z2, z3, z4, z5, z11, z13;
-    DCTELEM *dataptr;  
-  
+    DCTELEM *dataptr;
+
     cnt*=4;
-    // Pass 1: process rows. 
-  
+    // Pass 1: process rows.
+
     dataptr = data;
-    for (; cnt > 0; cnt--) {    
+    for (; cnt > 0; cnt--) {
 	tmp0 = pixels[line_size*0] + pixels[line_size*7];
 	tmp7 = pixels[line_size*0] - pixels[line_size*7];
 	tmp1 = pixels[line_size*1] + pixels[line_size*6];
@@ -1887,26 +1887,26 @@ static void row_fdct_c(DCTELEM *data, co
 	tmp5 = pixels[line_size*2] - pixels[line_size*5];
 	tmp3 = pixels[line_size*3] + pixels[line_size*4];
 	tmp4 = pixels[line_size*3] - pixels[line_size*4];
-    
-	// Even part 
-    
-	tmp10 = tmp0 + tmp3;    
+
+	// Even part
+
+	tmp10 = tmp0 + tmp3;
 	tmp13 = tmp0 - tmp3;
 	tmp11 = tmp1 + tmp2;
 	tmp12 = tmp1 - tmp2;
-	//Even columns are written first, this leads to different order of columns 
+	//Even columns are written first, this leads to different order of columns
 	//in column_fidct(), but they are processed independently, so all ok.
 	//Later in the row_idct() columns readed at the same order.
-	dataptr[2] = tmp10 + tmp11; 
+	dataptr[2] = tmp10 + tmp11;
 	dataptr[3] = tmp10 - tmp11;
-    
+
 	z1 = MULTIPLY16H((tmp12 + tmp13)<<2, FIX_0_707106781);
-	dataptr[0] = tmp13 + z1;    
+	dataptr[0] = tmp13 + z1;
 	dataptr[1] = tmp13 - z1;
-    
-	// Odd part 
 
-	tmp10 = (tmp4 + tmp5) <<2;  
+	// Odd part
+
+	tmp10 = (tmp4 + tmp5) <<2;
 	tmp11 = (tmp5 + tmp6) <<2;
 	tmp12 = (tmp6 + tmp7) <<2;
 
@@ -1924,7 +1924,7 @@ static void row_fdct_c(DCTELEM *data, co
 	dataptr[7] = z11 - z4;
 
 	pixels++;               // advance pointer to next column
-	dataptr += DCTSIZE;         
+	dataptr += DCTSIZE;
     }
 }
 
@@ -1949,7 +1949,7 @@ static void row_fdct_mmx(DCTELEM *data, 
 	"add %%"REG_d", %%"REG_S"             \n\t"
 
 	"movq %%mm0, %%mm5             \n\t"
-	//       
+	//
 
 	"movd (%%"REG_S",%%"REG_a",4), %%mm3    \n\t" //7  ;prefetch!
 	"movq %%mm1, %%mm6             \n\t"
@@ -1991,7 +1991,7 @@ static void row_fdct_mmx(DCTELEM *data, 
 	"psubw %%mm5, %%mm0            \n\t" //t13
 
 	"psubw %%mm2, %%mm1            \n\t"
-	"paddw %%mm2, %%mm7            \n\t" //t11    
+	"paddw %%mm2, %%mm7            \n\t" //t11
 
 	"paddw %%mm0, %%mm1            \n\t"
 	"movq %%mm7, %%mm2             \n\t"
@@ -2012,7 +2012,7 @@ static void row_fdct_mmx(DCTELEM *data, 
 	"paddw %%mm1, %%mm0            \n\t" //d0
 	"punpckhwd %%mm6, %%mm2        \n\t"
 
-	"psubw %%mm1, %%mm5            \n\t" //d1                
+	"psubw %%mm1, %%mm5            \n\t" //d1
 	"movq %%mm0, %%mm6             \n\t"
 
 	"movq 1*8+%3, %%mm1            \n\t"
@@ -2028,16 +2028,16 @@ static void row_fdct_mmx(DCTELEM *data, 
 	"movq %%mm6, %%mm7             \n\t"
 
 	"movq %%mm0, "DCTSIZE_S"*0*2(%%"REG_D") \n\t"
-	"punpckldq %%mm2, %%mm6        \n\t" //2     
+	"punpckldq %%mm2, %%mm6        \n\t" //2
 
 	"movq %%mm5, "DCTSIZE_S"*1*2(%%"REG_D") \n\t"
-	"punpckhdq %%mm2, %%mm7        \n\t" //3    
+	"punpckhdq %%mm2, %%mm7        \n\t" //3
 
 	"movq %%mm6, "DCTSIZE_S"*2*2(%%"REG_D") \n\t"
 	"paddw %%mm1, %%mm4            \n\t"
 
 	"movq %%mm7, "DCTSIZE_S"*3*2(%%"REG_D") \n\t"
-	"psllw $2, %%mm3              \n\t" //t10    
+	"psllw $2, %%mm3              \n\t" //t10
 
 	"movq 0*8+%3, %%mm2           \n\t"
 	"psllw $2, %%mm4              \n\t" //t11
@@ -2064,17 +2064,17 @@ static void row_fdct_mmx(DCTELEM *data, 
 	"movq %%mm5, %%mm7             \n\t"
 
 	"paddw %%mm0, %%mm2            \n\t" //d4
-	"psubw %%mm0, %%mm6            \n\t" //d5    
+	"psubw %%mm0, %%mm6            \n\t" //d5
 
 	"movq %%mm2, %%mm4             \n\t"
-	"paddw %%mm3, %%mm1            \n\t" //z4    
+	"paddw %%mm3, %%mm1            \n\t" //z4
 
 	//transpose 4x4
 	"punpcklwd %%mm6, %%mm2        \n\t"
 	"paddw %%mm1, %%mm5            \n\t" //d6
 
 	"punpckhwd %%mm6, %%mm4        \n\t"
-	"psubw %%mm1, %%mm7            \n\t" //d7    
+	"psubw %%mm1, %%mm7            \n\t" //d7
 
 	"movq %%mm5, %%mm6             \n\t"
 	"punpcklwd %%mm7, %%mm5        \n\t"
@@ -2092,13 +2092,13 @@ static void row_fdct_mmx(DCTELEM *data, 
 	"punpckldq %%mm6, %%mm4        \n\t" //6
 
 	"movq %%mm7, "DCTSIZE_S"*1*2+"DCTSIZE_S"(%%"REG_D") \n\t"
-	"punpckhdq %%mm6, %%mm5        \n\t" //7    
+	"punpckhdq %%mm6, %%mm5        \n\t" //7
 
 	"movq %%mm4, "DCTSIZE_S"*2*2+"DCTSIZE_S"(%%"REG_D") \n\t"
 	"add $4, %%"REG_S"               \n\t"
 
 	"movq %%mm5, "DCTSIZE_S"*3*2+"DCTSIZE_S"(%%"REG_D") \n\t"
-	"add $"DCTSIZE_S"*2*4, %%"REG_D"      \n\t" //4 rows    
+	"add $"DCTSIZE_S"*2*4, %%"REG_D"      \n\t" //4 rows
 	"dec %%"REG_c"                   \n\t"
 	"jnz 6b                  \n\t"
 

Modified: trunk/libmpcodecs/vf_halfpack.c
==============================================================================
--- trunk/libmpcodecs/vf_halfpack.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_halfpack.c	Wed May 13 04:58:57 2009	(r29305)
@@ -53,7 +53,7 @@ static void halfpack_MMX(unsigned char *
 			"paddw %%mm4, %%mm2 \n\t"
 			"psrlw $1, %%mm1 \n\t"
 			"psrlw $1, %%mm2 \n\t"
-			
+
 			"movq (%2), %%mm3 \n\t"
 			"movq (%3), %%mm5 \n\t"
 			"punpcklbw %%mm0, %%mm3 \n\t"
@@ -198,11 +198,11 @@ static int open(vf_instance_t *vf, char*
 	vf->query_format=query_format;
 	vf->put_image=put_image;
 	vf->uninit=uninit;
-	
+
 	vf->priv = calloc(1, sizeof (struct vf_priv_s));
 	vf->priv->field = 2;
 	if (args) sscanf(args, "%d", &vf->priv->field);
-	
+
 	halfpack = halfpack_C;
 #if HAVE_MMX
 	if(gCpuCaps.hasMMX) halfpack = halfpack_MMX;

Modified: trunk/libmpcodecs/vf_harddup.c
==============================================================================
--- trunk/libmpcodecs/vf_harddup.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_harddup.c	Wed May 13 04:58:57 2009	(r29305)
@@ -18,7 +18,7 @@ static int put_image(struct vf_instance_
 	mp_image_t *dmpi;
 
 	vf->priv->last_mpi = mpi;
-	
+
 	dmpi = vf_get_image(vf->next, mpi->imgfmt,
 		MP_IMGTYPE_EXPORT, 0, mpi->width, mpi->height);
 
@@ -30,7 +30,7 @@ static int put_image(struct vf_instance_
 		dmpi->planes[2] = mpi->planes[2];
 		dmpi->stride[2] = mpi->stride[2];
 	}
-	
+
 	return vf_next_put_image(vf, dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_hqdn3d.c
==============================================================================
--- trunk/libmpcodecs/vf_hqdn3d.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_hqdn3d.c	Wed May 13 04:58:57 2009	(r29305)
@@ -101,7 +101,7 @@ static void deNoiseSpacial(
     int sLineOffs = 0, dLineOffs = 0;
     unsigned int PixelAnt;
     unsigned int PixelDst;
-    
+
     /* First pixel has no left nor top neighbor. */
     PixelDst = LineAnt[0] = PixelAnt = Frame[0]<<16;
     FrameDest[0]= ((PixelDst+0x10007FFF)>>16);
@@ -142,7 +142,7 @@ static void deNoise(unsigned char *Frame
     unsigned int PixelAnt;
     unsigned int PixelDst;
     unsigned short* FrameAnt=(*FrameAntPtr);
-    
+
     if(!FrameAnt){
 	(*FrameAntPtr)=FrameAnt=malloc(W*H*sizeof(unsigned short));
 	for (Y = 0; Y < H; Y++){

Modified: trunk/libmpcodecs/vf_hue.c
==============================================================================
--- trunk/libmpcodecs/vf_hue.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_hue.c	Wed May 13 04:58:57 2009	(r29305)
@@ -65,7 +65,7 @@ static int put_image(struct vf_instance_
 	dmpi=vf_get_image(vf->next, mpi->imgfmt,
 			  MP_IMGTYPE_EXPORT, 0,
 			  mpi->w, mpi->h);
-	
+
 	dmpi->planes[0] = mpi->planes[0];
 	dmpi->stride[0] = mpi->stride[0];
 	dmpi->stride[1] = mpi->stride[1];
@@ -75,7 +75,7 @@ static int put_image(struct vf_instance_
 		vf->priv->buf[0] = malloc(mpi->stride[1]*mpi->h >> mpi->chroma_y_shift);
 		vf->priv->buf[1] = malloc(mpi->stride[2]*mpi->h >> mpi->chroma_y_shift);
 	}
-	
+
 	if (vf->priv->hue == 0 && vf->priv->saturation == 1){
 		dmpi->planes[1] = mpi->planes[1];
 		dmpi->planes[2] = mpi->planes[2];
@@ -85,7 +85,7 @@ static int put_image(struct vf_instance_
 		process(dmpi->planes[1], dmpi->planes[2],
 			mpi->planes[1], mpi->planes[2],
 			dmpi->stride[1],mpi->stride[1],
-			mpi->w>> mpi->chroma_x_shift, mpi->h>> mpi->chroma_y_shift, 
+			mpi->w>> mpi->chroma_x_shift, mpi->h>> mpi->chroma_y_shift,
 			vf->priv->hue, vf->priv->saturation);
 	}
 
@@ -151,7 +151,7 @@ static int open(vf_instance_t *vf, char*
 	vf->query_format=query_format;
 	vf->put_image=put_image;
 	vf->uninit=uninit;
-	
+
 	if(!vf->priv) {
 	vf->priv = malloc(sizeof(struct vf_priv_s));
 	memset(vf->priv, 0, sizeof(struct vf_priv_s));

Modified: trunk/libmpcodecs/vf_il.c
==============================================================================
--- trunk/libmpcodecs/vf_il.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_il.c	Wed May 13 04:58:57 2009	(r29305)
@@ -87,19 +87,19 @@ static int put_image(struct vf_instance_
 	else
 		w= mpi->w * mpi->bpp/8;
 
-	interleave(dmpi->planes[0], mpi->planes[0], 
+	interleave(dmpi->planes[0], mpi->planes[0],
 		w, mpi->h, dmpi->stride[0], mpi->stride[0], luma->interleave, luma->swap);
 
 	if(mpi->flags&MP_IMGFLAG_PLANAR){
 		int cw= mpi->w >> mpi->chroma_x_shift;
 		int ch= mpi->h >> mpi->chroma_y_shift;
 
-		interleave(dmpi->planes[1], mpi->planes[1], cw,ch, 
+		interleave(dmpi->planes[1], mpi->planes[1], cw,ch,
 			dmpi->stride[1], mpi->stride[1], chroma->interleave, luma->swap);
-		interleave(dmpi->planes[2], mpi->planes[2], cw,ch, 
+		interleave(dmpi->planes[2], mpi->planes[2], cw,ch,
 			dmpi->stride[2], mpi->stride[2], chroma->interleave, luma->swap);
 	}
-    
+
 	return vf_next_put_image(vf,dmpi, pts);
 }
 
@@ -125,7 +125,7 @@ static int open(vf_instance_t *vf, char*
 //	vf->get_image=get_image;
 	vf->priv=malloc(sizeof(struct vf_priv_s));
 	memset(vf->priv, 0, sizeof(struct vf_priv_s));
-	
+
 	if(args)
 	{
 		char *arg2= strchr(args,':');

Modified: trunk/libmpcodecs/vf_ilpack.c
==============================================================================
--- trunk/libmpcodecs/vf_ilpack.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_ilpack.c	Wed May 13 04:58:57 2009	(r29305)
@@ -71,7 +71,7 @@ static void pack_nn_MMX(unsigned char *d
 		"punpcklbw %%mm6, %%mm4 \n\t"
 		"punpcklbw %%mm4, %%mm1 \n\t"
 		"punpckhbw %%mm4, %%mm2 \n\t"
-		
+
 		"add $8, %0 \n\t"
 		"add $4, %1 \n\t"
 		"add $4, %2 \n\t"
@@ -81,7 +81,7 @@ static void pack_nn_MMX(unsigned char *d
 		"decl %4 \n\t"
 		"jnz 1b \n\t"
 		"emms \n\t"
-		: 
+		:
 		: "r" (y), "r" (u), "r" (v), "r" (dst), "r" (w/8)
 		: "memory"
 		);
@@ -100,12 +100,12 @@ static void pack_li_0_MMX(unsigned char 
 		"movl (%%"REG_d"), %%"REG_d" \n\t"
 #endif
 		"pxor %%mm0, %%mm0 \n\t"
-		
+
 		ASMALIGN(4)
 		".Lli0: \n\t"
 		"movq (%%"REG_S"), %%mm1 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
-		
+
 		"movq (%%"REG_a",%%"REG_d",2), %%mm4 \n\t"
 		"movq (%%"REG_b",%%"REG_BP",2), %%mm6 \n\t"
 		"punpcklbw %%mm0, %%mm4 \n\t"
@@ -135,13 +135,13 @@ static void pack_li_0_MMX(unsigned char 
 		"punpcklbw %%mm6, %%mm4 \n\t"
 		"punpcklbw %%mm4, %%mm1 \n\t"
 		"punpckhbw %%mm4, %%mm2 \n\t"
-		
+
 		"movq %%mm1, (%%"REG_D") \n\t"
 		"movq %%mm2, 8(%%"REG_D") \n\t"
-		
+
 		"movq 8(%%"REG_S"), %%mm1 \n\t"
 		"movq 8(%%"REG_S"), %%mm2 \n\t"
-		
+
 		"movq (%%"REG_a",%%"REG_d",2), %%mm4 \n\t"
 		"movq (%%"REG_b",%%"REG_BP",2), %%mm6 \n\t"
 		"punpckhbw %%mm0, %%mm4 \n\t"
@@ -171,20 +171,20 @@ static void pack_li_0_MMX(unsigned char 
 		"punpcklbw %%mm6, %%mm4 \n\t"
 		"punpcklbw %%mm4, %%mm1 \n\t"
 		"punpckhbw %%mm4, %%mm2 \n\t"
-		
+
 		"add $16, %%"REG_S" \n\t"
 		"add $8, %%"REG_a" \n\t"
 		"add $8, %%"REG_b" \n\t"
-		
+
 		"movq %%mm1, 16(%%"REG_D") \n\t"
 		"movq %%mm2, 24(%%"REG_D") \n\t"
 		"add $32, %%"REG_D" \n\t"
-		
+
 		"decl %%ecx \n\t"
 		"jnz .Lli0 \n\t"
 		"emms \n\t"
 		"pop %%"REG_BP" \n\t"
-		: 
+		:
 		: "S" (y), "D" (dst), "a" (u), "b" (v), "c" (w/16),
 #if ARCH_X86_64
 		"d" ((x86_reg)us), "r" ((x86_reg)vs)
@@ -208,12 +208,12 @@ static void pack_li_1_MMX(unsigned char 
 		"movl (%%"REG_d"), %%"REG_d" \n\t"
 #endif
 		"pxor %%mm0, %%mm0 \n\t"
-		
+
 		ASMALIGN(4)
 		".Lli1: \n\t"
 		"movq (%%"REG_S"), %%mm1 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
-		
+
 		"movq (%%"REG_a",%%"REG_d",2), %%mm4 \n\t"
 		"movq (%%"REG_b",%%"REG_BP",2), %%mm6 \n\t"
 		"punpcklbw %%mm0, %%mm4 \n\t"
@@ -245,13 +245,13 @@ static void pack_li_1_MMX(unsigned char 
 		"punpcklbw %%mm6, %%mm4 \n\t"
 		"punpcklbw %%mm4, %%mm1 \n\t"
 		"punpckhbw %%mm4, %%mm2 \n\t"
-		
+
 		"movq %%mm1, (%%"REG_D") \n\t"
 		"movq %%mm2, 8(%%"REG_D") \n\t"
-		
+
 		"movq 8(%%"REG_S"), %%mm1 \n\t"
 		"movq 8(%%"REG_S"), %%mm2 \n\t"
-		
+
 		"movq (%%"REG_a",%%"REG_d",2), %%mm4 \n\t"
 		"movq (%%"REG_b",%%"REG_BP",2), %%mm6 \n\t"
 		"punpckhbw %%mm0, %%mm4 \n\t"
@@ -283,20 +283,20 @@ static void pack_li_1_MMX(unsigned char 
 		"punpcklbw %%mm6, %%mm4 \n\t"
 		"punpcklbw %%mm4, %%mm1 \n\t"
 		"punpckhbw %%mm4, %%mm2 \n\t"
-		
+
 		"add $16, %%"REG_S" \n\t"
 		"add $8, %%"REG_a" \n\t"
 		"add $8, %%"REG_b" \n\t"
-		
+
 		"movq %%mm1, 16(%%"REG_D") \n\t"
 		"movq %%mm2, 24(%%"REG_D") \n\t"
 		"add $32, %%"REG_D" \n\t"
-		
+
 		"decl %%ecx \n\t"
 		"jnz .Lli1 \n\t"
 		"emms \n\t"
 		"pop %%"REG_BP" \n\t"
-		: 
+		:
 		: "S" (y), "D" (dst), "a" (u), "b" (v), "c" (w/16),
 #if ARCH_X86_64
 		"d" ((x86_reg)us), "r" ((x86_reg)vs)
@@ -392,7 +392,7 @@ static int open(vf_instance_t *vf, char*
 	vf->priv = calloc(1, sizeof(struct vf_priv_s));
 	vf->priv->mode = 1;
 	if (args) sscanf(args, "%d", &vf->priv->mode);
-	
+
 	pack_nn = (pack_func_t *)pack_nn_C;
 	pack_li_0 = pack_li_0_C;
 	pack_li_1 = pack_li_1_C;
@@ -417,7 +417,7 @@ static int open(vf_instance_t *vf, char*
 		vf->priv->pack[1] = pack_li_1;
 		break;
 	}
-	
+
 	return 1;
 }
 

Modified: trunk/libmpcodecs/vf_ivtc.c
==============================================================================
--- trunk/libmpcodecs/vf_ivtc.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_ivtc.c	Wed May 13 04:58:57 2009	(r29305)
@@ -45,16 +45,16 @@ static void block_diffs_MMX(struct metri
 {
 	int i;
 	short out[24]; // output buffer for the partial metrics from the mmx code
-	
+
 	__asm__ (
 		"movl $4, %%ecx \n\t"
 		"pxor %%mm4, %%mm4 \n\t" // 4 even difference sums
 		"pxor %%mm5, %%mm5 \n\t" // 4 odd difference sums
 		"pxor %%mm7, %%mm7 \n\t" // all zeros
-		
+
 		ASMALIGN(4)
 		"1: \n\t"
-		
+
 		// Even difference
 		"movq (%%"REG_S"), %%mm0 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
@@ -73,7 +73,7 @@ static void block_diffs_MMX(struct metri
 		"paddw %%mm1, %%mm4 \n\t"
 		"paddw %%mm2, %%mm4 \n\t"
 		"paddw %%mm3, %%mm4 \n\t"
-		
+
 		// Odd difference
 		"movq (%%"REG_S"), %%mm0 \n\t"
 		"movq (%%"REG_S"), %%mm2 \n\t"
@@ -92,12 +92,12 @@ static void block_diffs_MMX(struct metri
 		"paddw %%mm1, %%mm5 \n\t"
 		"paddw %%mm2, %%mm5 \n\t"
 		"paddw %%mm3, %%mm5 \n\t"
-			
+
 		"decl %%ecx \n\t"
 		"jnz 1b \n\t"
 		"movq %%mm4, (%%"REG_d") \n\t"
 		"movq %%mm5, 8(%%"REG_d") \n\t"
-		: 
+		:
 		: "S" (old), "D" (new), "a" (os), "b" (ns), "d" (out)
 		: "memory"
 		);
@@ -111,10 +111,10 @@ static void block_diffs_MMX(struct metri
 		"pxor %%mm4, %%mm4 \n\t" // Past spacial noise
 		"pxor %%mm5, %%mm5 \n\t" // Temporal noise
 		"pxor %%mm6, %%mm6 \n\t" // Current spacial noise
-		
+
 		ASMALIGN(4)
 		"2: \n\t"
-		
+
 		"movq (%%"REG_S"), %%mm0 \n\t"
 		"movq (%%"REG_S",%%"REG_a"), %%mm1 \n\t"
 		"add %%"REG_a", %%"REG_S" \n\t"
@@ -133,10 +133,10 @@ static void block_diffs_MMX(struct metri
 		"psubw %%mm0, %%mm4 \n\t"
 		"psubw %%mm2, %%mm5 \n\t"
 		"psubw %%mm2, %%mm6 \n\t"
-		
+
 		"decl %%ecx \n\t"
 		"jnz 2b \n\t"
-		
+
 		"movq %%mm0, %%mm1 \n\t"
 		"movq %%mm0, %%mm2 \n\t"
 		"movq %%mm0, %%mm3 \n\t"
@@ -165,10 +165,10 @@ static void block_diffs_MMX(struct metri
 		"pxor %%mm4, %%mm4 \n\t"
 		"pxor %%mm5, %%mm5 \n\t"
 		"pxor %%mm6, %%mm6 \n\t"
-		
+
 		ASMALIGN(4)
 		"3: \n\t"
-		
+
 		"movq (%%"REG_S"), %%mm0 \n\t"
 		"movq (%%"REG_S",%%"REG_a"), %%mm1 \n\t"
 		"add %%"REG_a", %%"REG_S" \n\t"
@@ -187,10 +187,10 @@ static void block_diffs_MMX(struct metri
 		"psubw %%mm0, %%mm4 \n\t"
 		"psubw %%mm2, %%mm5 \n\t"
 		"psubw %%mm2, %%mm6 \n\t"
-		
+
 		"decl %%ecx \n\t"
 		"jnz 3b \n\t"
-		
+
 		"movq %%mm0, %%mm1 \n\t"
 		"movq %%mm0, %%mm2 \n\t"
 		"movq %%mm0, %%mm3 \n\t"
@@ -208,7 +208,7 @@ static void block_diffs_MMX(struct metri
 		"movq %%mm6, 40(%%"REG_d") \n\t"
 
 		"emms \n\t"
-		: 
+		:
 		: "S" (old), "D" (new), "a" ((long)os), "b" ((long)ns), "d" (out)
 		: "memory"
 		);
@@ -328,7 +328,7 @@ static int foo(struct vf_priv_s *p, mp_i
 		p->dropnext = 0;
 		return F_DROP;
 	}
-	
+
 	// Sometimes a pulldown frame comes all by itself, so both
 	// its top and bottom field are duplicates from the adjacent
 	// two frames. We can just drop such a frame, but we
@@ -338,7 +338,7 @@ static int foo(struct vf_priv_s *p, mp_i
 		p->dropnext = 1;
 		return F_NEXT;
 	}
-	
+
 	// If none of these conditions hold, we will consider the frame
 	// progressive and just show it as-is.
 	if (!(  (3*f[0].r.e < f[0].r.o) ||
@@ -424,7 +424,7 @@ static int do_put_image(struct vf_instan
 		dropflag = (++p->lastdrop >= 5) && (4*p->inframes <= 5*p->outframes);
 		break;
 	}
-	
+
 	if (dropflag) {
 		//mp_msg(MSGT_VFILTER, MSGL_V, "drop! [%d/%d=%g]\n",
 		//	p->outframes, p->inframes, (float)p->outframes/p->inframes);
@@ -457,7 +457,7 @@ static int put_image(struct vf_instance_
 	p->dmpi->qscale = mpi->qscale;
 	p->dmpi->qstride = mpi->qstride;
 	p->dmpi->qscale_type = mpi->qscale_type;
-		
+
 	switch (foo(p, mpi, p->dmpi)) {
 	case F_DROP:
 		copy_image(p->dmpi, mpi, 2);

Modified: trunk/libmpcodecs/vf_lavc.c
==============================================================================
--- trunk/libmpcodecs/vf_lavc.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_lavc.c	Wed May 13 04:58:57 2009	(r29305)
@@ -34,7 +34,7 @@ static int config(struct vf_instance_s* 
 
     lavc_venc_context.width = width;
     lavc_venc_context.height = height;
-    
+
     if(!lavc_venc_context.time_base.num || !lavc_venc_context.time_base.den){
 	// guess FPS:
 	switch(height){
@@ -81,7 +81,7 @@ static int put_image(struct vf_instance_
     pic->linesize[1]=mpi->stride[1];
     pic->linesize[2]=mpi->stride[2];
 
-    out_size = avcodec_encode_video(&lavc_venc_context, 
+    out_size = avcodec_encode_video(&lavc_venc_context,
 	vf->priv->outbuf, vf->priv->outbuf_size, pic);
 
     if(out_size<=0) return 1;
@@ -89,14 +89,14 @@ static int put_image(struct vf_instance_
     dmpi=vf_get_image(vf->next,IMGFMT_MPEGPES,
 	MP_IMGTYPE_EXPORT, 0,
 	mpi->w, mpi->h);
-    
+
     vf->priv->pes.data=vf->priv->outbuf;
     vf->priv->pes.size=out_size;
     vf->priv->pes.id=0x1E0;
     vf->priv->pes.timestamp=-1; // dunno
-    
+
     dmpi->planes[0]=(unsigned char*)&vf->priv->pes;
-    
+
     return vf_next_put_image(vf,dmpi, MP_NOPTS_VALUE);
 }
 
@@ -115,7 +115,7 @@ static int query_format(struct vf_instan
 static int open(vf_instance_t *vf, char* args){
     int p_quality=0;
     float p_fps=0;
-    
+
     vf->config=config;
     vf->put_image=put_image;
     vf->query_format=query_format;
@@ -133,7 +133,7 @@ static int open(vf_instance_t *vf, char*
 	mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_MissingLAVCcodec, "mpeg1video");
 	return 0;
     }
-    
+
     vf->priv->context=avcodec_alloc_context();
     vf->priv->pic = avcodec_alloc_frame();
 

Modified: trunk/libmpcodecs/vf_lavcdeint.c
==============================================================================
--- trunk/libmpcodecs/vf_lavcdeint.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_lavcdeint.c	Wed May 13 04:58:57 2009	(r29305)
@@ -14,7 +14,7 @@
 
 extern int avcodec_initialized;
 
-struct vf_priv_s 
+struct vf_priv_s
 {
   int       width, height;
   int       pix_fmt;
@@ -69,7 +69,7 @@ imgfmt_to_pixfmt (int imgfmt)
 }
 
 
-static int 
+static int
 config (struct vf_instance_s* vf,
         int width, int height, int d_width, int d_height,
         unsigned int flags, unsigned int outfmt)
@@ -79,7 +79,7 @@ config (struct vf_instance_s* vf,
   priv->pix_fmt = imgfmt_to_pixfmt(outfmt);
   if(priv->pix_fmt == -1)
     return 0;
-  
+
   /* The deinterlacer will fail if this is false */
   if ((width & 3) != 0 || (height & 3) != 0)
     return 0;
@@ -95,21 +95,21 @@ config (struct vf_instance_s* vf,
 			flags, outfmt);
 }
 
-static int 
+static int
 put_image (struct vf_instance_s* vf, mp_image_t *mpi, double pts)
 {
   struct vf_priv_s *priv = vf->priv;
   mp_image_t* dmpi;
   AVPicture pic;
   AVPicture lavc_picture;
-  
+
   lavc_picture.data[0]     = mpi->planes[0];
   lavc_picture.data[1]     = mpi->planes[1];
   lavc_picture.data[2]     = mpi->planes[2];
   lavc_picture.linesize[0] = mpi->stride[0];
   lavc_picture.linesize[1] = mpi->stride[1];
   lavc_picture.linesize[2] = mpi->stride[2];
-  
+
   dmpi = vf_get_image(vf->next, mpi->imgfmt,
 		      MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
 		      priv->width, priv->height);
@@ -121,18 +121,18 @@ put_image (struct vf_instance_s* vf, mp_
   pic.linesize[1] = dmpi->stride[1];
   pic.linesize[2] = dmpi->stride[2];
 
-  if (avpicture_deinterlace(&pic, &lavc_picture, 
+  if (avpicture_deinterlace(&pic, &lavc_picture,
 			    priv->pix_fmt, priv->width, priv->height) < 0)
     {
       /* This should not happen -- see config() */
       return 0;
     }
-  
+
   return vf_next_put_image(vf, dmpi, pts);
 }
 
 
-static int 
+static int
 query_format (struct vf_instance_s* vf, unsigned int fmt)
 {
   if(imgfmt_to_pixfmt(fmt) == -1)
@@ -142,7 +142,7 @@ query_format (struct vf_instance_s* vf, 
 }
 
 
-static int 
+static int
 open (vf_instance_t *vf, char* args)
 {
   /* We don't have any args */

Modified: trunk/libmpcodecs/vf_mcdeint.c
==============================================================================
--- trunk/libmpcodecs/vf_mcdeint.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_mcdeint.c	Wed May 13 04:58:57 2009	(r29305)
@@ -25,7 +25,7 @@ Known Issues:
   frames are created purely based on spatial interpolation then for example
   a thin black line or another random and not interpolateable pattern
   will cause problems
-  Note: completly ignoring the "unavailable" lines during motion estimation 
+  Note: completly ignoring the "unavailable" lines during motion estimation
   didnt look any better, so the most obvious solution would be to improve
   tfields or penalize problematic motion vectors ...
 
@@ -33,7 +33,7 @@ Known Issues:
   and as a result sometimes creates artifacts
 
 * only past frames are used, we should ideally use future frames too, something
-  like filtering the whole movie in forward and then backward direction seems 
+  like filtering the whole movie in forward and then backward direction seems
   like a interresting idea but the current filter framework is FAR from
   supporting such things
 

Modified: trunk/libmpcodecs/vf_mirror.c
==============================================================================
--- trunk/libmpcodecs/vf_mirror.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_mirror.c	Wed May 13 04:58:57 2009	(r29305)
@@ -89,7 +89,7 @@ static int put_image(struct vf_instance_
 	       dmpi->w,dmpi->h,dmpi->bpp>>3,mpi->imgfmt);
 	dmpi->planes[1]=mpi->planes[1]; // passthrough rgb8 palette
     }
-    
+
     return vf_next_put_image(vf,dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_noformat.c
==============================================================================
--- trunk/libmpcodecs/vf_noformat.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_noformat.c	Wed May 13 04:58:57 2009	(r29305)
@@ -68,7 +68,7 @@ static int open(vf_instance_t *vf, char*
 	if(!strcasecmp(args,"abgr")) vf->priv->fmt=IMGFMT_ABGR; else
 	{ mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_UnknownFormatName, args);return 0;}
     }
-        
+
 
     return 1;
 }

Modified: trunk/libmpcodecs/vf_noise.c
==============================================================================
--- trunk/libmpcodecs/vf_noise.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_noise.c	Wed May 13 04:58:57 2009	(r29305)
@@ -110,7 +110,7 @@ static int8_t *initNoise(FilterParam *fp
 				x2 = 2.0 * rand()/(float)RAND_MAX - 1.0;
 				w = x1 * x1 + x2 * x2;
 			} while ( w >= 1.0 );
-		
+
 			w = sqrt( (-2.0 * log( w ) ) / w );
 			y1= x1 * w;
 			y1*= strength / sqrt(3.0);
@@ -125,7 +125,7 @@ static int8_t *initNoise(FilterParam *fp
 		}
 		if (RAND_N(6) == 0) j--;
 	}
-	
+
 
 	for (i = 0; i < MAX_RES; i++)
 	    for (j = 0; j < 3; j++)
@@ -246,7 +246,7 @@ static inline void lineNoiseAvg_MMX(uint
 		"movq %%mm1, (%4, %%"REG_a")	\n\t"
 		"add $8, %%"REG_a"		\n\t"
 		" js 1b				\n\t"
-		:: "r" (src+mmx_len), "r" (shift[0]+mmx_len), "r" (shift[1]+mmx_len), "r" (shift[2]+mmx_len), 
+		:: "r" (src+mmx_len), "r" (shift[0]+mmx_len), "r" (shift[1]+mmx_len), "r" (shift[2]+mmx_len),
                    "r" (dst+mmx_len), "g" (-mmx_len)
 		: "%"REG_a
 	);
@@ -261,7 +261,7 @@ static inline void lineNoiseAvg_MMX(uint
 static inline void lineNoiseAvg_C(uint8_t *dst, uint8_t *src, int len, int8_t **shift){
 	int i;
         int8_t *src2= (int8_t*)src;
-	
+
 	for(i=0; i<len; i++)
 	{
 	    const int n= shift[0][i] + shift[1][i] + shift[2][i];
@@ -374,7 +374,7 @@ static void uninit(struct vf_instance_s*
 
 	if(vf->priv->lumaParam.noise) free(vf->priv->lumaParam.noise);
 	vf->priv->lumaParam.noise= NULL;
-	
+
 	free(vf->priv);
 	vf->priv=NULL;
 }
@@ -446,7 +446,7 @@ static int open(vf_instance_t *vf, char*
         return 0; // no csp match :(
     }
 
- 
+
 #if HAVE_MMX
     if(gCpuCaps.hasMMX){
         lineNoise= lineNoise_MMX;
@@ -457,7 +457,7 @@ static int open(vf_instance_t *vf, char*
     if(gCpuCaps.hasMMX2) lineNoise= lineNoise_MMX2;
 //    if(gCpuCaps.hasMMX) lineNoiseAvg= lineNoiseAvg_MMX2;
 #endif
-    
+
     return 1;
 }
 

Modified: trunk/libmpcodecs/vf_ow.c
==============================================================================
--- trunk/libmpcodecs/vf_ow.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_ow.c	Wed May 13 04:58:57 2009	(r29305)
@@ -26,7 +26,7 @@
  * @todo use QP to decide filter strength
  * @todo wavelet normalization / least squares optimal signal vs. noise thresholds
  */
- 
+
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>

Modified: trunk/libmpcodecs/vf_palette.c
==============================================================================
--- trunk/libmpcodecs/vf_palette.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_palette.c	Wed May 13 04:58:57 2009	(r29305)
@@ -76,7 +76,7 @@ static int config(struct vf_instance_s* 
 
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
-    
+
     // hope we'll get DR buffer:
     dmpi=vf_get_image(vf->next,vf->priv->fmt,
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
@@ -152,7 +152,7 @@ static int put_image(struct vf_instance_
 	    }
 	}
     }
-    
+
     return vf_next_put_image(vf,dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_perspective.c
==============================================================================
--- trunk/libmpcodecs/vf_perspective.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_perspective.c	Wed May 13 04:58:57 2009	(r29305)
@@ -64,18 +64,18 @@ static void initPv(struct vf_priv_s *pri
 	    - (ref[0][0] - ref[1][0] - ref[2][0] + ref[3][0])*(ref[1][1] - ref[3][1]))*W;
 	D=   (ref[1][0] - ref[3][0])*(ref[2][1] - ref[3][1])
 	   - (ref[2][0] - ref[3][0])*(ref[1][1] - ref[3][1]);
-	
+
 	a= D*(ref[1][0] - ref[0][0])*H + g*ref[1][0];
 	b= D*(ref[2][0] - ref[0][0])*W + h*ref[2][0];
 	c= D*ref[0][0]*W*H;
 	d= D*(ref[1][1] - ref[0][1])*H + g*ref[1][1];
 	e= D*(ref[2][1] - ref[0][1])*W + h*ref[2][1];
 	f= D*ref[0][1]*W*H;
-	
+
 	for(y=0; y<H; y++){
 		for(x=0; x<W; x++){
 			int u, v;
-			
+
 			u= (int)floor( SUB_PIXELS*(a*x + b*y + c)/(g*x + h*y + D*W*H) + 0.5);
 			v= (int)floor( SUB_PIXELS*(d*x + e*y + f)/(g*x + h*y + D*W*H) + 0.5);
 
@@ -88,7 +88,7 @@ static void initPv(struct vf_priv_s *pri
 static double getCoeff(double d){
 	double A= -0.60;
 	double coeff;
-	
+
 	d= fabs(d);
 
 	// Equation is from VirtualDub
@@ -98,7 +98,7 @@ static double getCoeff(double d){
 		coeff = (-4.0*A + 8.0*A*d - 5.0*A*d*d + A*d*d*d);
 	else
 		coeff=0.0;
-	
+
 	return coeff;
 }
 
@@ -110,18 +110,18 @@ static int config(struct vf_instance_s* 
 	vf->priv->pvStride= width;
 	vf->priv->pv= (void*)memalign(8, width*height*2*sizeof(int32_t));
 	initPv(vf->priv, width, height);
-	
+
 	for(i=0; i<SUB_PIXELS; i++){
 		double d= i/(double)SUB_PIXELS;
 		double temp[4];
 		double sum=0;
-		
+
 		for(j=0; j<4; j++)
 			temp[j]= getCoeff(j - d - 1);
-		
+
 		for(j=0; j<4; j++)
 			sum+= temp[j];
-			
+
 		for(j=0; j<4; j++)
 			vf->priv->coeff[i][j]= (int)floor((1<<COEFF_BITS)*temp[j]/sum + 0.5);
 	}
@@ -142,7 +142,7 @@ static void uninit(struct vf_instance_s*
 static inline void resampleCubic(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, struct vf_priv_s *privParam, int xShift, int yShift){
 	int x, y;
 	struct vf_priv_s priv= *privParam;
-	
+
 	for(y=0; y<h; y++){
 		for(x=0; x<w; x++){
 			int u, v, subU, subV, sum, sx, sy;
@@ -162,7 +162,7 @@ static inline void resampleCubic(uint8_t
 				const int b= priv.coeff[subU][1];
 				const int c= priv.coeff[subU][2];
 				const int d= priv.coeff[subU][3];
-				
+
 				sum=
 				 priv.coeff[subV][0]*(  a*src[index - 1 - srcStride] + b*src[index - 0 - srcStride]
 				                      + c*src[index + 1 - srcStride] + d*src[index + 2 - srcStride])
@@ -184,7 +184,7 @@ static inline void resampleCubic(uint8_t
 						int ix= u + dx - 1;
 						if     (ix< 0) ix=0;
 						else if(ix>=w) ix=w-1;
-						
+
 						sum+=  priv.coeff[subU][dx]*priv.coeff[subV][dy]
 						      *src[ ix + iy*srcStride];
 					}
@@ -200,11 +200,11 @@ static inline void resampleCubic(uint8_t
 	}
 }
 
-static inline void resampleLinear(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride, 
+static inline void resampleLinear(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, int srcStride,
 				  struct vf_priv_s *privParam, int xShift, int yShift){
 	int x, y;
 	struct vf_priv_s priv= *privParam;
-	
+
 	for(y=0; y<h; y++){
 		for(x=0; x<w; x++){
 			int u, v, subU, subV, sum, sx, sy, index, subUI, subVI;
@@ -220,7 +220,7 @@ static inline void resampleLinear(uint8_
 			index= u + v*srcStride;
 			subUI= SUB_PIXELS - subU;
 			subVI= SUB_PIXELS - subV;
-            
+
 			if((unsigned)u < (unsigned)(w - 1)){
 				if((unsigned)v < (unsigned)(h - 1)){
 					sum= subVI*(subUI*src[index          ] + subU*src[index          +1])
@@ -267,20 +267,20 @@ static int put_image(struct vf_instance_
 		mpi->w,mpi->h);
 
 	assert(mpi->flags&MP_IMGFLAG_PLANAR);
-	
+
 	if(vf->priv->cubic){
-		resampleCubic(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, dmpi->stride[0], mpi->stride[0], 
+		resampleCubic(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, dmpi->stride[0], mpi->stride[0],
 				vf->priv, 0, 0);
-		resampleCubic(dmpi->planes[1], mpi->planes[1], cw    , ch   , dmpi->stride[1], mpi->stride[1], 
+		resampleCubic(dmpi->planes[1], mpi->planes[1], cw    , ch   , dmpi->stride[1], mpi->stride[1],
 				vf->priv, mpi->chroma_x_shift, mpi->chroma_y_shift);
-		resampleCubic(dmpi->planes[2], mpi->planes[2], cw    , ch   , dmpi->stride[2], mpi->stride[2], 
+		resampleCubic(dmpi->planes[2], mpi->planes[2], cw    , ch   , dmpi->stride[2], mpi->stride[2],
 				vf->priv, mpi->chroma_x_shift, mpi->chroma_y_shift);
 	}else{
-		resampleLinear(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, dmpi->stride[0], mpi->stride[0], 
+		resampleLinear(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, dmpi->stride[0], mpi->stride[0],
 				vf->priv, 0, 0);
-		resampleLinear(dmpi->planes[1], mpi->planes[1], cw    , ch   , dmpi->stride[1], mpi->stride[1], 
+		resampleLinear(dmpi->planes[1], mpi->planes[1], cw    , ch   , dmpi->stride[1], mpi->stride[1],
 				vf->priv, mpi->chroma_x_shift, mpi->chroma_y_shift);
-		resampleLinear(dmpi->planes[2], mpi->planes[2], cw    , ch   , dmpi->stride[2], mpi->stride[2], 
+		resampleLinear(dmpi->planes[2], mpi->planes[2], cw    , ch   , dmpi->stride[2], mpi->stride[2],
 				vf->priv, mpi->chroma_x_shift, mpi->chroma_y_shift);
 	}
 
@@ -316,7 +316,7 @@ static int open(vf_instance_t *vf, char*
 	memset(vf->priv, 0, sizeof(struct vf_priv_s));
 
 	if(args==NULL) return 0;
-	
+
 	e=sscanf(args, "%lf:%lf:%lf:%lf:%lf:%lf:%lf:%lf:%d",
 		&vf->priv->ref[0][0], &vf->priv->ref[0][1],
 		&vf->priv->ref[1][0], &vf->priv->ref[1][1],

Modified: trunk/libmpcodecs/vf_phase.c
==============================================================================
--- trunk/libmpcodecs/vf_phase.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_phase.c	Wed May 13 04:58:57 2009	(r29305)
@@ -36,7 +36,7 @@ static void do_plane(unsigned char *to, 
    {
    unsigned char *buf, *end;
    int top;
- 
+
    if(!*bufp)
       {
       mode=PROGRESSIVE;
@@ -81,7 +81,7 @@ static enum mode analyze_plane(unsigned 
    else if(mode==AUTO_ANALYZE)
       mode=fields&MP_IMGFIELD_ORDERED?fields&MP_IMGFIELD_TOP_FIRST?
 	 TOP_FIRST_ANALYZE:BOTTOM_FIRST_ANALYZE:FULL_ANALYZE;
-   
+
    if(fixed_mode(mode))
       bdiff=pdiff=tdiff=65536.0;
    else
@@ -116,7 +116,7 @@ static enum mode analyze_plane(unsigned 
 		     pdif+=diff(new, ns, new, ns),
 		     bdif+=diff(new, ns, old, os);
 	       break;
-	       
+
 	    case ANALYZE:
 	       if(top)
 		  for(rend=new+w; new<rend; new++, old++)
@@ -144,20 +144,20 @@ static enum mode analyze_plane(unsigned 
 	 pdiff+=(double)pdif;
 	 tdiff+=(double)tdif;
 	 bdiff+=(double)bdif;
-	 }      
+	 }
 
       scale=1.0/(w*(h-3))/25.0;
       pdiff*=scale;
       tdiff*=scale;
       bdiff*=scale;
-      
+
       if(mode==TOP_FIRST_ANALYZE)
 	 bdiff=65536.0;
       else if(mode==BOTTOM_FIRST_ANALYZE)
 	 tdiff=65536.0;
       else if(mode==ANALYZE)
 	 pdiff=65536.0;
-      
+
       if(bdiff<pdiff && bdiff<tdiff)
 	 mode=BOTTOM_FIRST;
       else if(tdiff<pdiff && tdiff<bdiff)
@@ -205,7 +205,7 @@ static int put_image(struct vf_instance_
    do_plane(dmpi->planes[0], mpi->planes[0],
 	    w, dmpi->h,
 	    dmpi->stride[0], mpi->stride[0],
-	    &vf->priv->buf[0], mode);      
+	    &vf->priv->buf[0], mode);
 
    if(dmpi->flags&MP_IMGFLAG_PLANAR)
       {
@@ -241,10 +241,10 @@ static int open(vf_instance_t *vf, char*
       uninit(vf);
       return 0;
       }
-   
+
    vf->priv->mode=AUTO_ANALYZE;
    vf->priv->verbose=0;
-      
+
    while(args && *args)
       {
       switch(*args)

Modified: trunk/libmpcodecs/vf_pp.c
==============================================================================
--- trunk/libmpcodecs/vf_pp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_pp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -48,7 +48,7 @@ static int config(struct vf_instance_s* 
     case IMGFMT_411P: flags|= PP_FORMAT_411; break;
     default:          flags|= PP_FORMAT_420; break;
     }
-        
+
     if(vf->priv->context) pp_free_context(vf->priv->context);
     vf->priv->context= pp_get_context(width, height, flags);
 
@@ -90,7 +90,7 @@ static int control(struct vf_instance_s*
 
 static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
     if(vf->priv->pp&0xFFFF) return; // non-local filters enabled
-    if((mpi->type==MP_IMGTYPE_IPB || vf->priv->pp) && 
+    if((mpi->type==MP_IMGTYPE_IPB || vf->priv->pp) &&
 	mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change
     if(!(mpi->flags&MP_IMGFLAG_ACCEPT_STRIDE) && mpi->imgfmt!=vf->priv->outfmt)
 	return; // colorspace differ
@@ -120,7 +120,7 @@ static int put_image(struct vf_instance_
 	    (mpi->width+7)&(~7),(mpi->height+7)&(~7));
 	vf->dmpi->w=mpi->w; vf->dmpi->h=mpi->h; // display w;h
     }
-    
+
     if(vf->priv->pp || !(mpi->flags&MP_IMGFLAG_DIRECT)){
 	// do the postprocessing! (or copy if no DR)
 	pp_postprocess(mpi->planes           ,mpi->stride,
@@ -155,7 +155,7 @@ static int open(vf_instance_t *vf, char*
     char *endptr, *name;
     int i;
     int hex_mode=0;
-    
+
     vf->query_format=query_format;
     vf->control=control;
     vf->config=config;
@@ -169,7 +169,7 @@ static int open(vf_instance_t *vf, char*
     // check csp:
     vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12);
     if(!vf->priv->outfmt) return 0; // no csp match :(
-    
+
     if(args){
 	hex_mode= strtol(args, &endptr, 0);
 	if(*endptr){
@@ -192,9 +192,9 @@ static int open(vf_instance_t *vf, char*
         /* hex mode for compatibility */
         for(i=0; i<=PP_QUALITY_MAX; i++){
 	    PPMode *ppMode;
-	    
+
 	    ppMode= (PPMode*)memalign(8, sizeof(PPMode));
-	    
+
 	    ppMode->lumMode= hex_mode;
 	    ppMode->chromMode= ((hex_mode&0xFF)>>4) | (hex_mode&0xFFFFFF00);
 	    ppMode->maxTmpNoise[0]= 700;
@@ -204,12 +204,12 @@ static int open(vf_instance_t *vf, char*
 	    ppMode->minAllowedY= 16;
 	    ppMode->baseDcDiff= 256/4;
 	    ppMode->flatnessThreshold=40;
-    
+
             vf->priv->ppMode[i]= ppMode;
         }
     }
 #endif
-    
+
     vf->priv->pp=PP_QUALITY_MAX;
     return 1;
 }

Modified: trunk/libmpcodecs/vf_pp7.c
==============================================================================
--- trunk/libmpcodecs/vf_pp7.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_pp7.c	Wed May 13 04:58:57 2009	(r29305)
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
- 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -227,9 +227,9 @@ static void init_thres2(void){
 }
 
 static int hardthresh_c(DCTELEM *src, int qp){
-    int i; 
+    int i;
     int a;
-    
+
     a= src[0] * factor[0];
     for(i=1; i<16; i++){
         unsigned int threshold1= thres2[qp][i];
@@ -243,9 +243,9 @@ static int hardthresh_c(DCTELEM *src, in
 }
 
 static int mediumthresh_c(DCTELEM *src, int qp){
-    int i; 
+    int i;
     int a;
-    
+
     a= src[0] * factor[0];
     for(i=1; i<16; i++){
         unsigned int threshold1= thres2[qp][i];
@@ -264,9 +264,9 @@ static int mediumthresh_c(DCTELEM *src, 
 }
 
 static int softthresh_c(DCTELEM *src, int qp){
-    int i; 
+    int i;
     int a;
-    
+
     a= src[0] * factor[0];
     for(i=1; i<16; i++){
         unsigned int threshold1= thres2[qp][i];
@@ -293,7 +293,7 @@ static void filter(struct vf_priv_s *p, 
     for(y=0; y<height; y++){
         int index= 8 + 8*stride + y*stride;
         fast_memcpy(p_src + index, src + y*src_stride, width);
-        for(x=0; x<8; x++){ 
+        for(x=0; x<8; x++){
             p_src[index         - x - 1]= p_src[index +         x    ];
             p_src[index + width + x    ]= p_src[index + width - x - 1];
         }
@@ -309,14 +309,14 @@ static void filter(struct vf_priv_s *p, 
             const int index= x + y*stride + (8-3)*(1+stride) + 8; //FIXME silly offset
             uint8_t *src  = p_src + index;
             DCTELEM *tp= temp+4*x;
-            
+
             dctA_c(tp+4*8, src, stride);
-        }        
+        }
         for(x=0; x<width; ){
             const int qps= 3 + is_luma;
             int qp;
             int end= XMIN(x+8, width);
-            
+
             if(p->qp)
                 qp= p->qp;
             else{
@@ -328,12 +328,12 @@ static void filter(struct vf_priv_s *p, 
                 uint8_t *src  = p_src + index;
                 DCTELEM *tp= temp+4*x;
                 int v;
-                
+
                 if((x&3)==0)
                     dctA_c(tp+4*8, src, stride);
-                
+
                 dctB(block, tp);
-                
+
                 v= requantize(block, qp);
                 v= (v + dither[y&7][x&7])>>6;
                 if((unsigned)v > 255)
@@ -351,7 +351,7 @@ static int config(struct vf_instance_s* 
 
     vf->priv->temp_stride= (width+16+15)&(~15);
     vf->priv->src = memalign(8, vf->priv->temp_stride*(h+8)*sizeof(uint8_t));
-    
+
     return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
 }
 
@@ -412,7 +412,7 @@ static void uninit(struct vf_instance_s*
 
     if(vf->priv->src) free(vf->priv->src);
     vf->priv->src= NULL;
-    
+
     free(vf->priv);
     vf->priv=NULL;
 }
@@ -449,14 +449,14 @@ static int open(vf_instance_t *vf, char*
     vf->control= control;
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv, 0, sizeof(struct vf_priv_s));
-    
+
     if (args) sscanf(args, "%d:%d", &vf->priv->qp, &vf->priv->mode);
 
     if(vf->priv->qp < 0)
         vf->priv->qp = 0;
 
     init_thres2();
-        
+
     switch(vf->priv->mode){
 	case 0: requantize= hardthresh_c; break;
 	case 1: requantize= softthresh_c; break;
@@ -477,7 +477,7 @@ static int open(vf_instance_t *vf, char*
 	}
     }
 #endif
-    
+
     return 1;
 }
 

Modified: trunk/libmpcodecs/vf_pullup.c
==============================================================================
--- trunk/libmpcodecs/vf_pullup.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_pullup.c	Wed May 13 04:58:57 2009	(r29305)
@@ -51,7 +51,7 @@ static void init_pullup(struct vf_instan
 	if (gCpuCaps.has3DNowExt) c->cpu |= PULLUP_CPU_3DNOWEXT;
 	if (gCpuCaps.hasSSE) c->cpu |= PULLUP_CPU_SSE;
 	if (gCpuCaps.hasSSE2) c->cpu |= PULLUP_CPU_SSE2;
-	
+
 	pullup_init_context(c);
 
 	vf->priv->init = 1;
@@ -64,7 +64,7 @@ static void get_image(struct vf_instance
 {
 	struct pullup_context *c = vf->priv->ctx;
 	struct pullup_buffer *b;
-	
+
 	if (mpi->type == MP_IMGTYPE_STATIC) return;
 
 	if (!vf->priv->init) init_pullup(vf, mpi);
@@ -73,7 +73,7 @@ static void get_image(struct vf_instance
 	if (!b) return; /* shouldn't happen... */
 
 	mpi->priv = b;
-	
+
 	mpi->planes[0] = b->planes[0];
 	mpi->planes[1] = b->planes[1];
 	mpi->planes[2] = b->planes[2];
@@ -95,9 +95,9 @@ static int put_image(struct vf_instance_
 	int ret;
 	int p;
 	int i;
-	
+
 	if (!vf->priv->init) init_pullup(vf, mpi);
-	
+
 	if (mpi->flags & MP_IMGFLAG_DIRECT) {
 		b = mpi->priv;
 		mpi->priv = 0;
@@ -221,11 +221,11 @@ static int put_image(struct vf_instance_
 	dmpi->planes[0] = f->buffer->planes[0];
 	dmpi->planes[1] = f->buffer->planes[1];
 	dmpi->planes[2] = f->buffer->planes[2];
-		
+
 	dmpi->stride[0] = c->stride[0];
 	dmpi->stride[1] = c->stride[1];
 	dmpi->stride[2] = c->stride[2];
-	
+
 	if (mpi->qscale) {
 		dmpi->qscale = vf->priv->qbuf;
 		dmpi->qstride = mpi->qstride;

Modified: trunk/libmpcodecs/vf_qp.c
==============================================================================
--- trunk/libmpcodecs/vf_qp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_qp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -50,7 +50,7 @@ static int config(struct vf_instance_s* 
 
 	vf->priv->qp_stride= (width+15)>>4;
         vf->priv->qp= av_malloc(vf->priv->qp_stride*h*sizeof(int8_t));
-        
+
         for(i=-129; i<128; i++){
             double const_values[]={
                 M_PI,
@@ -105,7 +105,7 @@ static int put_image(struct vf_instance_
 	}
 
 	dmpi= vf->dmpi;
-        
+
 	if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
 		memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h, dmpi->stride[0], mpi->stride[0]);
     		if(mpi->flags&MP_IMGFLAG_PLANAR){
@@ -114,13 +114,13 @@ static int put_image(struct vf_instance_
 		}
 	}
         vf_clone_mpi_attributes(dmpi, mpi);
-        
+
         dmpi->qscale = vf->priv->qp;
         dmpi->qstride= vf->priv->qp_stride;
         if(mpi->qscale){
             for(y=0; y<((dmpi->h+15)>>4); y++){
                 for(x=0; x<vf->priv->qp_stride; x++){
-                    dmpi->qscale[x + dmpi->qstride*y]= 
+                    dmpi->qscale[x + dmpi->qstride*y]=
                         vf->priv->lut[ 129 + ((int8_t)mpi->qscale[x + mpi->qstride*y]) ];
                 }
             }
@@ -141,7 +141,7 @@ static void uninit(struct vf_instance_s*
 
 	if(vf->priv->qp) av_free(vf->priv->qp);
 	vf->priv->qp= NULL;
-	
+
 	av_free(vf->priv);
 	vf->priv=NULL;
 }
@@ -154,11 +154,11 @@ static int open(vf_instance_t *vf, char*
     vf->uninit=uninit;
     vf->priv=av_malloc(sizeof(struct vf_priv_s));
     memset(vf->priv, 0, sizeof(struct vf_priv_s));
-    
+
 //    avcodec_init();
 
     if (args) strncpy(vf->priv->eq, args, 199);
-	
+
     return 1;
 }
 

Modified: trunk/libmpcodecs/vf_rectangle.c
==============================================================================
--- trunk/libmpcodecs/vf_rectangle.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_rectangle.c	Wed May 13 04:58:57 2009	(r29305)
@@ -74,7 +74,7 @@ put_image(struct vf_instance_s* vf, mp_i
 			mpi->w, mpi->h);
 
     memcpy_pic(dmpi->planes[0],mpi->planes[0],mpi->w*bpp, mpi->h,
-	       dmpi->stride[0],mpi->stride[0]);    
+	       dmpi->stride[0],mpi->stride[0]);
     if(mpi->flags&MP_IMGFLAG_PLANAR && mpi->flags&MP_IMGFLAG_YUV){
 	memcpy_pic(dmpi->planes[1],mpi->planes[1],
 		   mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift,
@@ -148,7 +148,7 @@ open(vf_instance_t* vf, char* args) {
     vf->priv->w = -1;
     vf->priv->h = -1;
     if (args)
-	sscanf(args, "%d:%d:%d:%d", 
+	sscanf(args, "%d:%d:%d:%d",
 	       &vf->priv->w, &vf->priv->h, &vf->priv->x, &vf->priv->y);
     return 1;
 }

Modified: trunk/libmpcodecs/vf_remove_logo.c
==============================================================================
--- trunk/libmpcodecs/vf_remove_logo.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_remove_logo.c	Wed May 13 04:58:57 2009	(r29305)
@@ -23,7 +23,7 @@
 
 /**
  * \file vf_remove_logo.c
- * 
+ *
  * \brief Advanced blur-based logo removing filter.
 
  *     Hello and welcome. This code implements a filter to remove annoying TV
@@ -195,7 +195,7 @@ static void calculate_bounding_rectangle
   int x; /* Temporary variables to run  */
   int y; /* through each row or column. */
   int start_x;
-  int start_y; 
+  int start_y;
   int end_x = filter->width - 1;
   int end_y = filter->height - 1;
   int did_we_find_a_logo_pixel = 0;
@@ -318,7 +318,7 @@ static void initialize_masks(vf_instance
         if ((b * b) + (c * c) <= (a * a)) /* Circular 0/1 mask. */
           mask[a][b + a][c + a] = 1;
         else
-          mask[a][b + a][c + a] = 0; 
+          mask[a][b + a][c + a] = 0;
       }
     }
   }
@@ -766,7 +766,7 @@ static void convert_yv12(const vf_instan
  */
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
-    
+
     dmpi=vf_get_image(vf->next,((vf_priv_s *)vf->priv)->fmt,
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
 	mpi->w, mpi->h);

Modified: trunk/libmpcodecs/vf_rgb2bgr.c
==============================================================================
--- trunk/libmpcodecs/vf_rgb2bgr.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_rgb2bgr.c	Wed May 13 04:58:57 2009	(r29305)
@@ -33,7 +33,7 @@ static unsigned int getfmt(unsigned int 
     case IMGFMT_BGR24: return IMGFMT_RGB24;
     case IMGFMT_BGR32: return IMGFMT_RGB32;
     }
-    return 0;    
+    return 0;
 }
 
 static int config(struct vf_instance_s* vf,

Modified: trunk/libmpcodecs/vf_rgbtest.c
==============================================================================
--- trunk/libmpcodecs/vf_rgbtest.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_rgbtest.c	Wed May 13 04:58:57 2009	(r29305)
@@ -31,7 +31,7 @@ static unsigned int getfmt(unsigned int 
     case IMGFMT_ABGR:
 	return outfmt;
     }
-    return 0;    
+    return 0;
 }
 
 static void put_pixel(uint8_t *buf, int x, int y, int stride, int r, int g, int b, int fmt){
@@ -44,7 +44,7 @@ static void put_pixel(uint8_t *buf, int 
     break;
     case IMGFMT_RGB16: ((uint16_t*)(buf + y*stride))[x]= ((b>>3)<<11) | ((g>>2)<<5) | (r>>3);
     break;
-    case IMGFMT_RGB24: 
+    case IMGFMT_RGB24:
         buf[3*x + y*stride + 0]= r;
         buf[3*x + y*stride + 1]= g;
         buf[3*x + y*stride + 2]= b;
@@ -102,11 +102,11 @@ static int put_image(struct vf_instance_
          for(x=0; x<w; x++){
              int c= 256*x/w;
              int r=0,g=0,b=0;
-             
+
              if(3*y<h)        r=c;
              else if(3*y<2*h) g=c;
              else                  b=c;
-             
+
              put_pixel(dmpi->planes[0], x, y, dmpi->stride[0], r, g, b, vf->priv->fmt);
          }
      }

Modified: trunk/libmpcodecs/vf_rotate.c
==============================================================================
--- trunk/libmpcodecs/vf_rotate.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_rotate.c	Wed May 13 04:58:57 2009	(r29305)
@@ -87,10 +87,10 @@ static int put_image(struct vf_instance_
     } else {
 	rotate(dmpi->planes[0],mpi->planes[0],
 	       dmpi->stride[0],mpi->stride[0],
-	       dmpi->w,dmpi->h,dmpi->bpp>>3,vf->priv->direction);	
+	       dmpi->w,dmpi->h,dmpi->bpp>>3,vf->priv->direction);
 	dmpi->planes[1] = mpi->planes[1]; // passthrough rgb8 palette
     }
-    
+
     return vf_next_put_image(vf,dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_sab.c
==============================================================================
--- trunk/libmpcodecs/vf_sab.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_sab.c	Wed May 13 04:58:57 2009	(r29305)
@@ -103,16 +103,16 @@ static int allocStuff(FilterParam *f, in
 	swsF.chrH= swsF.chrV= NULL;
 	f->preFilterContext= sws_getContext(
 		width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, get_sws_cpuflags()|SWS_POINT, &swsF, NULL, NULL);
-	
+
 	sws_freeVec(vec);
 	vec = sws_getGaussianVec(f->strength, 5.0);
 	for(i=0; i<512; i++){
 		double d;
 		int index= i-256 + vec->length/2;
-		
+
 		if(index<0 || index>=vec->length) 	d= 0.0;
 		else					d= vec->coeff[index];
-		
+
 		f->colorDiffCoeff[i]= (int)(d/vec->coeff[vec->length/2]*(1<<12) + 0.5);
 	}
 	sws_freeVec(vec);
@@ -124,25 +124,25 @@ static int allocStuff(FilterParam *f, in
 	for(y=0; y<vec->length; y++){
 		for(x=0; x<vec->length; x++){
 			double d= vec->coeff[x] * vec->coeff[y];
-			
+
 			f->distCoeff[x + y*f->distStride]= (int)(d*(1<<10) + 0.5);
 //			if(y==vec->length/2)
 //				printf("%6d ", f->distCoeff[x + y*f->distStride]);
 		}
 	}
 	sws_freeVec(vec);
-	
+
 	return 0;
 }
 
 static int config(struct vf_instance_s* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
-	
+
 	int sw, sh;
 //__asm__ volatile("emms\n\t");
 	allocStuff(&vf->priv->luma, width, height);
-	
+
 	getSubSampleFactors(&sw, &sh, outfmt);
 	allocStuff(&vf->priv->chroma, width>>sw, height>>sh);
 
@@ -152,10 +152,10 @@ static int config(struct vf_instance_s* 
 static void freeBuffers(FilterParam *f){
 	if(f->preFilterContext) sws_freeContext(f->preFilterContext);
 	f->preFilterContext=NULL;
-	
+
 	if(f->preFilterBuf) free(f->preFilterBuf);
 	f->preFilterBuf=NULL;
-	
+
 	if(f->distCoeff) free(f->distCoeff);
 	f->distCoeff=NULL;
 }
@@ -181,7 +181,7 @@ static inline void blur(uint8_t *dst, ui
 
 //	f.preFilterContext->swScale(f.preFilterContext, srcArray, srcStrideArray, 0, h, dstArray, dstStrideArray);
 	sws_scale(f.preFilterContext, srcArray, srcStrideArray, 0, h, dstArray, dstStrideArray);
-	
+
 	for(y=0; y<h; y++){
 		for(x=0; x<w; x++){
 			int sum=0;
@@ -247,11 +247,11 @@ static int put_image(struct vf_instance_
 		mpi->w,mpi->h);
 
 	assert(mpi->flags&MP_IMGFLAG_PLANAR);
-	
+
 	blur(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, dmpi->stride[0], mpi->stride[0], &vf->priv->luma);
 	blur(dmpi->planes[1], mpi->planes[1], cw    , ch   , dmpi->stride[1], mpi->stride[1], &vf->priv->chroma);
 	blur(dmpi->planes[2], mpi->planes[2], cw    , ch   , dmpi->stride[2], mpi->stride[2], &vf->priv->chroma);
-    
+
 	return vf_next_put_image(vf,dmpi, pts);
 }
 
@@ -284,7 +284,7 @@ static int open(vf_instance_t *vf, char*
 	memset(vf->priv, 0, sizeof(struct vf_priv_s));
 
 	if(args==NULL) return 0;
-	
+
 	e=sscanf(args, "%f:%f:%f:%f:%f:%f",
 		&vf->priv->luma.radius,
 		&vf->priv->luma.preFilterRadius,
@@ -295,7 +295,7 @@ static int open(vf_instance_t *vf, char*
 		);
 
 	vf->priv->luma.quality = vf->priv->chroma.quality= 3.0;
-	
+
 	if(e==3){
 		vf->priv->chroma.radius= vf->priv->luma.radius;
 		vf->priv->chroma.preFilterRadius = vf->priv->luma.preFilterRadius;
@@ -305,7 +305,7 @@ static int open(vf_instance_t *vf, char*
 
 //	if(vf->priv->luma.radius < 0) return 0;
 //	if(vf->priv->chroma.radius < 0) return 0;
-		
+
 	return 1;
 }
 

Modified: trunk/libmpcodecs/vf_scale.c
==============================================================================
--- trunk/libmpcodecs/vf_scale.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_scale.c	Wed May 13 04:58:57 2009	(r29305)
@@ -97,13 +97,13 @@ static unsigned int find_best_out(vf_ins
             ret= vf_next_query_format(vf, outfmt_list[i]);
             vf->priv->query_format_cache[i]= ret+1;
         }
-        
+
 	mp_msg(MSGT_VFILTER,MSGL_DBG2,"scale: query(%s) -> %d\n",vo_format_name(format),ret&3);
 	if(ret&VFCAP_CSP_SUPPORTED_BY_HW){
             best=format; // no conversion -> bingo!
             break;
-        } 
-	if(ret&VFCAP_CSP_SUPPORTED && !best) 
+        }
+	if(ret&VFCAP_CSP_SUPPORTED && !best)
             best=format; // best with conversion
     }
     return best;
@@ -119,7 +119,7 @@ static int config(struct vf_instance_s* 
     int i;
     SwsFilter *srcFilter, *dstFilter;
     enum PixelFormat dfmt, sfmt;
-    
+
     if(!best){
 	mp_msg(MSGT_VFILTER,MSGL_WARN,"SwScale: no supported outfmt found :(\n");
 	return 0;
@@ -127,15 +127,15 @@ static int config(struct vf_instance_s* 
     sfmt = imgfmt2pixfmt(outfmt);
     if (outfmt == IMGFMT_RGB8 || outfmt == IMGFMT_BGR8) sfmt = PIX_FMT_PAL8;
     dfmt = imgfmt2pixfmt(best);
-    
+
     vo_flags=vf->next->query_format(vf->next,best);
-    
+
     // scaling to dwidth*d_height, if all these TRUE:
     // - option -zoom
     // - no other sw/hw up/down scaling avail.
     // - we're after postproc
     // - user didn't set w:h
-    if(!(vo_flags&VFCAP_POSTPROC) && (flags&4) && 
+    if(!(vo_flags&VFCAP_POSTPROC) && (flags&4) &&
 	    vf->priv->w<0 && vf->priv->h<0){	// -zoom
 	int x=(vo_flags&VFCAP_SWSCALE) ? 0 : 1;
 	if(d_width<width || d_height<height){
@@ -214,7 +214,7 @@ static int config(struct vf_instance_s* 
     case IMGFMT_UYVY:
       vf->priv->w = (vf->priv->w + 1) & ~1;
     }
-    
+
     mp_msg(MSGT_VFILTER,MSGL_DBG2,"SwScale: scaling %dx%d %s to %dx%d %s  \n",
 	width,height,vo_format_name(outfmt),
 	vf->priv->w,vf->priv->h,vo_format_name(best));
@@ -222,7 +222,7 @@ static int config(struct vf_instance_s* 
     // free old ctx:
     if(vf->priv->ctx) sws_freeContext(vf->priv->ctx);
     if(vf->priv->ctx2)sws_freeContext(vf->priv->ctx2);
-    
+
     // new swscaler:
     sws_getFlagsAndFilterFromCmdLine(&int_sws_flags, &srcFilter, &dstFilter);
     int_sws_flags|= vf->priv->v_chr_drop << SWS_SRC_V_CHR_DROP_SHIFT;
@@ -271,7 +271,7 @@ static int config(struct vf_instance_s* 
             vf->priv->palette[4*i+3]=0;
 	}
 	break; }
-    case IMGFMT_BGR4: 
+    case IMGFMT_BGR4:
     case IMGFMT_BG4B: {
 	vf->priv->palette=malloc(4*16);
 	for(i=0; i<16; i++){
@@ -281,7 +281,7 @@ static int config(struct vf_instance_s* 
             vf->priv->palette[4*i+3]=0;
 	}
 	break; }
-    case IMGFMT_RGB4: 
+    case IMGFMT_RGB4:
     case IMGFMT_RG4B: {
 	vf->priv->palette=malloc(4*16);
 	for(i=0; i<16; i++){
@@ -346,7 +346,7 @@ static void scale(struct SwsContext *sws
         sws_scale_ordered(sws2, src2, src_stride2, y>>1, h>>1, dst2, dst_stride2);
     }else{
         sws_scale_ordered(sws1, src2, src_stride, y, h, dst, dst_stride);
-    }                  
+    }
 }
 
 static void draw_slice(struct vf_instance_s* vf,
@@ -365,14 +365,14 @@ static int put_image(struct vf_instance_
 
 //    printf("vf_scale::put_image(): processing whole frame! dmpi=%p flag=%d\n",
 //	dmpi, (mpi->flags&MP_IMGFLAG_DRAW_CALLBACK));
-    
+
   if(!(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK && dmpi)){
-  
+
     // hope we'll get DR buffer:
     dmpi=vf_get_image(vf->next,vf->priv->fmt,
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
 	vf->priv->w, vf->priv->h);
-    
+
       scale(vf->priv->ctx, vf->priv->ctx, mpi->planes,mpi->stride,0,mpi->h,dmpi->planes,dmpi->stride, vf->priv->interlaced);
   }
 
@@ -383,7 +383,7 @@ static int put_image(struct vf_instance_
     }
 
     if(vf->priv->palette) dmpi->planes[1]=vf->priv->palette; // export palette!
-    
+
     return vf_next_put_image(vf,dmpi, pts);
 }
 
@@ -442,7 +442,7 @@ static int control(struct vf_instance_s*
     default:
 	break;
     }
-    
+
     return vf_next_control(vf,request,data);
 }
 
@@ -463,17 +463,17 @@ static int query_format(struct vf_instan
     case IMGFMT_BGR15:
     case IMGFMT_RGB32:
     case IMGFMT_RGB24:
-    case IMGFMT_Y800: 
-    case IMGFMT_Y8: 
-    case IMGFMT_YVU9: 
-    case IMGFMT_IF09: 
-    case IMGFMT_444P: 
-    case IMGFMT_422P: 
-    case IMGFMT_411P: 
-    case IMGFMT_BGR8: 
-    case IMGFMT_RGB8: 
-    case IMGFMT_BG4B: 
-    case IMGFMT_RG4B: 
+    case IMGFMT_Y800:
+    case IMGFMT_Y8:
+    case IMGFMT_YVU9:
+    case IMGFMT_IF09:
+    case IMGFMT_444P:
+    case IMGFMT_422P:
+    case IMGFMT_411P:
+    case IMGFMT_BGR8:
+    case IMGFMT_RGB8:
+    case IMGFMT_BG4B:
+    case IMGFMT_RG4B:
     {
 	unsigned int best=find_best_out(vf);
 	int flags;
@@ -526,7 +526,7 @@ static int open(vf_instance_t *vf, char*
     mp_msg(MSGT_VFILTER,MSGL_V,"SwScale params: %d x %d (-1=no scaling)\n",
     vf->priv->w,
     vf->priv->h);
-    
+
     return 1;
 }
 
@@ -544,7 +544,7 @@ float sws_chr_sharpen= 0.0;
 float sws_lum_sharpen= 0.0;
 
 int get_sws_cpuflags(void){
-    return 
+    return
           (gCpuCaps.hasMMX   ? SWS_CPU_CAPS_MMX   : 0)
 	| (gCpuCaps.hasMMX2  ? SWS_CPU_CAPS_MMX2  : 0)
 	| (gCpuCaps.has3DNow ? SWS_CPU_CAPS_3DNOW : 0)
@@ -573,7 +573,7 @@ void sws_getFlagsAndFilterFromCmdLine(in
 		sws_lum_gblur, sws_chr_gblur,
 		sws_lum_sharpen, sws_chr_sharpen,
 		sws_chr_hshift, sws_chr_vshift, verbose>1);
-        
+
 	switch(sws_flags)
 	{
 		case 0: *flags|= SWS_FAST_BILINEAR; break;
@@ -589,7 +589,7 @@ void sws_getFlagsAndFilterFromCmdLine(in
 		case 10:*flags|= SWS_SPLINE; break;
 		default:*flags|= SWS_BILINEAR; break;
 	}
-	
+
 	*srcFilterParam= src_filter;
 	*dstFilterParam= NULL;
 }

Modified: trunk/libmpcodecs/vf_smartblur.c
==============================================================================
--- trunk/libmpcodecs/vf_smartblur.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_smartblur.c	Wed May 13 04:58:57 2009	(r29305)
@@ -97,11 +97,11 @@ static int allocStuff(FilterParam *f, in
 static int config(struct vf_instance_s* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
-	
+
 	int sw, sh;
 
 	allocStuff(&vf->priv->luma, width, height);
-	
+
 	getSubSampleFactors(&sw, &sh, outfmt);
 	allocStuff(&vf->priv->chroma, width>>sw, height>>sh);
 
@@ -132,14 +132,14 @@ static inline void blur(uint8_t *dst, ui
 	int dstStrideArray[MP_MAX_PLANES]= {dstStride};
 
 	sws_scale(f.filterContext, srcArray, srcStrideArray, 0, h, dstArray, dstStrideArray);
-	
+
 	if(f.threshold > 0){
 		for(y=0; y<h; y++){
 			for(x=0; x<w; x++){
 				const int orig= src[x + y*srcStride];
 				const int filtered= dst[x + y*dstStride];
 				const int diff= orig - filtered;
-				
+
 				if(diff > 0){
 					if(diff > 2*f.threshold){
 						dst[x + y*dstStride]= orig;
@@ -161,7 +161,7 @@ static inline void blur(uint8_t *dst, ui
 				const int orig= src[x + y*srcStride];
 				const int filtered= dst[x + y*dstStride];
 				const int diff= orig - filtered;
-				
+
 				if(diff > 0){
 					if(diff > -2*f.threshold){
 					}else if(diff > -f.threshold){
@@ -191,11 +191,11 @@ static int put_image(struct vf_instance_
 		mpi->w,mpi->h);
 
 	assert(mpi->flags&MP_IMGFLAG_PLANAR);
-	
+
 	blur(dmpi->planes[0], mpi->planes[0], mpi->w,mpi->h, dmpi->stride[0], mpi->stride[0], &vf->priv->luma);
 	blur(dmpi->planes[1], mpi->planes[1], cw    , ch   , dmpi->stride[1], mpi->stride[1], &vf->priv->chroma);
 	blur(dmpi->planes[2], mpi->planes[2], cw    , ch   , dmpi->stride[2], mpi->stride[2], &vf->priv->chroma);
-    
+
 	return vf_next_put_image(vf,dmpi, pts);
 }
 
@@ -228,7 +228,7 @@ static int open(vf_instance_t *vf, char*
 	memset(vf->priv, 0, sizeof(struct vf_priv_s));
 
 	if(args==NULL) return 0;
-	
+
 	e=sscanf(args, "%f:%f:%d:%f:%f:%d",
 		&vf->priv->luma.radius,
 		&vf->priv->luma.strength,
@@ -239,7 +239,7 @@ static int open(vf_instance_t *vf, char*
 		);
 
 	vf->priv->luma.quality = vf->priv->chroma.quality= 3.0;
-	
+
 	if(e==3){
 		vf->priv->chroma.radius= vf->priv->luma.radius;
 		vf->priv->chroma.strength= vf->priv->luma.strength;

Modified: trunk/libmpcodecs/vf_softskip.c
==============================================================================
--- trunk/libmpcodecs/vf_softskip.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_softskip.c	Wed May 13 04:58:57 2009	(r29305)
@@ -16,7 +16,7 @@ struct vf_priv_s {
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts)
 {
 	mp_image_t *dmpi;
-	
+
 	if (vf->priv->skipflag)
 		return vf->priv->skipflag = 0;
 
@@ -32,7 +32,7 @@ static int put_image(struct vf_instance_
 		dmpi->planes[2] = mpi->planes[2];
 		dmpi->stride[2] = mpi->stride[2];
 	}
-	
+
 	return vf_next_put_image(vf, dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_spp.c
==============================================================================
--- trunk/libmpcodecs/vf_spp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_spp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -20,12 +20,12 @@
 
 /*
  * This implementation is based on an algorithm described in
- * "Aria Nosratinia Embedded Post-Processing for 
+ * "Aria Nosratinia Embedded Post-Processing for
  * Enhancement of Compressed Images (1999)"
  * (http://citeseer.nj.nec.com/nosratinia99embedded.html)
  */
 
- 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -69,23 +69,23 @@ static const uint8_t offset[127][2]= {
 {0,0},
 {0,0}, {4,4},
 {0,0}, {2,2}, {6,4}, {4,6},
-{0,0}, {5,1}, {2,2}, {7,3}, {4,4}, {1,5}, {6,6}, {3,7}, 
+{0,0}, {5,1}, {2,2}, {7,3}, {4,4}, {1,5}, {6,6}, {3,7},
 
-{0,0}, {4,0}, {1,1}, {5,1}, {3,2}, {7,2}, {2,3}, {6,3}, 
-{0,4}, {4,4}, {1,5}, {5,5}, {3,6}, {7,6}, {2,7}, {6,7}, 
+{0,0}, {4,0}, {1,1}, {5,1}, {3,2}, {7,2}, {2,3}, {6,3},
+{0,4}, {4,4}, {1,5}, {5,5}, {3,6}, {7,6}, {2,7}, {6,7},
 
-{0,0}, {0,2}, {0,4}, {0,6}, {1,1}, {1,3}, {1,5}, {1,7}, 
-{2,0}, {2,2}, {2,4}, {2,6}, {3,1}, {3,3}, {3,5}, {3,7}, 
-{4,0}, {4,2}, {4,4}, {4,6}, {5,1}, {5,3}, {5,5}, {5,7}, 
-{6,0}, {6,2}, {6,4}, {6,6}, {7,1}, {7,3}, {7,5}, {7,7}, 
+{0,0}, {0,2}, {0,4}, {0,6}, {1,1}, {1,3}, {1,5}, {1,7},
+{2,0}, {2,2}, {2,4}, {2,6}, {3,1}, {3,3}, {3,5}, {3,7},
+{4,0}, {4,2}, {4,4}, {4,6}, {5,1}, {5,3}, {5,5}, {5,7},
+{6,0}, {6,2}, {6,4}, {6,6}, {7,1}, {7,3}, {7,5}, {7,7},
 
-{0,0}, {4,4}, {0,4}, {4,0}, {2,2}, {6,6}, {2,6}, {6,2}, 
-{0,2}, {4,6}, {0,6}, {4,2}, {2,0}, {6,4}, {2,4}, {6,0}, 
-{1,1}, {5,5}, {1,5}, {5,1}, {3,3}, {7,7}, {3,7}, {7,3}, 
-{1,3}, {5,7}, {1,7}, {5,3}, {3,1}, {7,5}, {3,5}, {7,1}, 
-{0,1}, {4,5}, {0,5}, {4,1}, {2,3}, {6,7}, {2,7}, {6,3}, 
-{0,3}, {4,7}, {0,7}, {4,3}, {2,1}, {6,5}, {2,5}, {6,1}, 
-{1,0}, {5,4}, {1,4}, {5,0}, {3,2}, {7,6}, {3,6}, {7,2}, 
+{0,0}, {4,4}, {0,4}, {4,0}, {2,2}, {6,6}, {2,6}, {6,2},
+{0,2}, {4,6}, {0,6}, {4,2}, {2,0}, {6,4}, {2,4}, {6,0},
+{1,1}, {5,5}, {1,5}, {5,1}, {3,3}, {7,7}, {3,7}, {7,3},
+{1,3}, {5,7}, {1,7}, {5,3}, {3,1}, {7,5}, {3,5}, {7,1},
+{0,1}, {4,5}, {0,5}, {4,1}, {2,3}, {6,7}, {2,7}, {6,3},
+{0,3}, {4,7}, {0,7}, {4,3}, {2,1}, {6,5}, {2,5}, {6,1},
+{1,0}, {5,4}, {1,4}, {5,0}, {3,2}, {7,6}, {3,6}, {7,2},
 {1,2}, {5,6}, {1,6}, {5,2}, {3,0}, {7,4}, {3,4}, {7,0},
 };
 
@@ -105,13 +105,13 @@ struct vf_priv_s {
 #define SHIFT 22
 
 static void hardthresh_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
-	int i; 
+	int i;
 	int bias= 0; //FIXME
 	unsigned int threshold1, threshold2;
-	
+
 	threshold1= qp*((1<<4) - bias) - 1;
 	threshold2= (threshold1<<1);
-        
+
 	memset(dst, 0, 64*sizeof(DCTELEM));
 	dst[0]= (src[0] + 4)>>3;
 
@@ -125,13 +125,13 @@ static void hardthresh_c(DCTELEM dst[64]
 }
 
 static void softthresh_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
-	int i; 
+	int i;
 	int bias= 0; //FIXME
 	unsigned int threshold1, threshold2;
-	
+
 	threshold1= qp*((1<<4) - bias) - 1;
 	threshold2= (threshold1<<1);
-        
+
 	memset(dst, 0, 64*sizeof(DCTELEM));
 	dst[0]= (src[0] + 4)>>3;
 
@@ -151,9 +151,9 @@ static void softthresh_c(DCTELEM dst[64]
 static void hardthresh_mmx(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
 	int bias= 0; //FIXME
 	unsigned int threshold1;
-	
+
 	threshold1= qp*((1<<4) - bias) - 1;
-	
+
         __asm__ volatile(
 #define REQUANT_CORE(dst0, dst1, dst2, dst3, src0, src1, src2, src3) \
 		"movq " #src0 ", %%mm0	\n\t"\
@@ -197,7 +197,7 @@ static void hardthresh_mmx(DCTELEM dst[6
 		"movq %%mm7, " #dst1 "	\n\t"\
 		"movq %%mm3, " #dst2 "	\n\t"\
 		"movq %%mm1, " #dst3 "	\n\t"
-                
+
 		"movd %2, %%mm4		\n\t"
 		"movd %3, %%mm5		\n\t"
 		"movd %4, %%mm6		\n\t"
@@ -221,7 +221,7 @@ static void softthresh_mmx(DCTELEM dst[6
 	unsigned int threshold1;
 
 	threshold1= qp*((1<<4) - bias) - 1;
-	
+
         __asm__ volatile(
 #undef REQUANT_CORE
 #define REQUANT_CORE(dst0, dst1, dst2, dst3, src0, src1, src2, src3) \
@@ -275,7 +275,7 @@ static void softthresh_mmx(DCTELEM dst[6
 		"movq %%mm7, " #dst1 "	\n\t"\
 		"movq %%mm3, " #dst2 "	\n\t"\
 		"movq %%mm1, " #dst3 "	\n\t"
-                
+
 		"movd %2, %%mm4		\n\t"
 		"movd %3, %%mm5		\n\t"
 		"packssdw %%mm4, %%mm4	\n\t"
@@ -295,7 +295,7 @@ static void softthresh_mmx(DCTELEM dst[6
 
 static inline void add_block(int16_t *dst, int stride, DCTELEM block[64]){
 	int y;
-	
+
 	for(y=0; y<8; y++){
 		*(uint32_t*)&dst[0 + y*stride]+= *(uint32_t*)&block[0 + y*8];
 		*(uint32_t*)&dst[2 + y*stride]+= *(uint32_t*)&block[2 + y*8];
@@ -385,7 +385,7 @@ static void filter(struct vf_priv_s *p, 
 	for(y=0; y<height; y++){
 		int index= 8 + 8*stride + y*stride;
 		fast_memcpy(p->src + index, src + y*src_stride, width);
-		for(x=0; x<8; x++){ 
+		for(x=0; x<8; x++){
 			p->src[index         - x - 1]= p->src[index +         x    ];
 			p->src[index + width + x    ]= p->src[index + width - x - 1];
 		}
@@ -401,7 +401,7 @@ static void filter(struct vf_priv_s *p, 
 		for(x=0; x<width+8; x+=8){
 			const int qps= 3 + is_luma;
 			int qp;
-                        
+
 			if(p->qp)
 				qp= p->qp;
 			else{
@@ -443,7 +443,7 @@ static int config(struct vf_instance_s* 
 	vf->priv->temp_stride= (width+16+15)&(~15);
         vf->priv->temp= malloc(vf->priv->temp_stride*h*sizeof(int16_t));
         vf->priv->src = malloc(vf->priv->temp_stride*h*sizeof(uint8_t));
-        
+
 	return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
 }
 
@@ -521,7 +521,7 @@ static void uninit(struct vf_instance_s*
         vf->priv->avctx= NULL;
         if(vf->priv->non_b_qp) free(vf->priv->non_b_qp);
         vf->priv->non_b_qp= NULL;
-	
+
 	free(vf->priv);
 	vf->priv=NULL;
 }
@@ -559,7 +559,7 @@ static int control(struct vf_instance_s*
 static int open(vf_instance_t *vf, char* args){
 
     int log2c=-1;
-    
+
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -568,14 +568,14 @@ static int open(vf_instance_t *vf, char*
     vf->control= control;
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv, 0, sizeof(struct vf_priv_s));
-    
+
     avcodec_init();
 
     vf->priv->avctx= avcodec_alloc_context();
     dsputil_init(&vf->priv->dsp, vf->priv->avctx);
-    
+
     vf->priv->log2_count= 3;
-    
+
     if (args) sscanf(args, "%d:%d:%d", &log2c, &vf->priv->qp, &vf->priv->mode);
 
     if( log2c >=0 && log2c <=6 )
@@ -599,7 +599,7 @@ static int open(vf_instance_t *vf, char*
 	}
     }
 #endif
-    
+
     return 1;
 }
 

Modified: trunk/libmpcodecs/vf_swapuv.c
==============================================================================
--- trunk/libmpcodecs/vf_swapuv.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_swapuv.c	Wed May 13 04:58:57 2009	(r29305)
@@ -33,7 +33,7 @@
 //===========================================================================//
 
 static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
-    mp_image_t *dmpi= vf_get_image(vf->next, mpi->imgfmt, 
+    mp_image_t *dmpi= vf_get_image(vf->next, mpi->imgfmt,
 	mpi->type, mpi->flags, mpi->w, mpi->h);
 
     mpi->planes[0]=dmpi->planes[0];
@@ -50,7 +50,7 @@ static void get_image(struct vf_instance
 
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
     mp_image_t *dmpi;
-    
+
     if(mpi->flags&MP_IMGFLAG_DIRECT){
 	dmpi=(mp_image_t*)mpi->priv;
     } else {
@@ -64,7 +64,7 @@ static int put_image(struct vf_instance_
 	dmpi->stride[2]=mpi->stride[1];
 	dmpi->width=mpi->width;
     }
-    
+
     vf_clone_mpi_attributes(dmpi, mpi);
 
     return vf_next_put_image(vf,dmpi, pts);

Modified: trunk/libmpcodecs/vf_telecine.c
==============================================================================
--- trunk/libmpcodecs/vf_telecine.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_telecine.c	Wed May 13 04:58:57 2009	(r29305)
@@ -21,7 +21,7 @@ static int put_image(struct vf_instance_
 	int ret;
 
 	vf->priv->frame = (vf->priv->frame+1)%4;
-	
+
 	dmpi = vf_get_image(vf->next, mpi->imgfmt,
 		MP_IMGTYPE_STATIC, MP_IMGFLAG_ACCEPT_STRIDE |
 		MP_IMGFLAG_PRESERVE, mpi->width, mpi->height);

Modified: trunk/libmpcodecs/vf_tfields.c
==============================================================================
--- trunk/libmpcodecs/vf_tfields.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_tfields.c	Wed May 13 04:58:57 2009	(r29305)
@@ -205,7 +205,7 @@ static void qpel_4tap_MMX(unsigned char 
 			"pmullw %%mm6, %%mm3 \n\t"
 			"movq (%%"REG_S",%%"REG_a",2), %%mm2 \n\t"
 			"psubusw %%mm3, %%mm1 \n\t"
-			"punpcklbw %%mm0, %%mm2 \n\t"	
+			"punpcklbw %%mm0, %%mm2 \n\t"
 			"pmullw %%mm7, %%mm2 \n\t"
 			"psubusw %%mm2, %%mm1 \n\t"
 			"psrlw $7, %%mm1 \n\t"
@@ -222,12 +222,12 @@ static void qpel_4tap_MMX(unsigned char 
 			"pmullw %%mm6, %%mm3 \n\t"
 			"psubusw %%mm3, %%mm2 \n\t"
 			"movq (%%"REG_S",%%"REG_a",2), %%mm3 \n\t"
-			"punpckhbw %%mm0, %%mm3 \n\t"	
+			"punpckhbw %%mm0, %%mm3 \n\t"
 			"add $8, %%"REG_S" \n\t"
 			"pmullw %%mm7, %%mm3 \n\t"
 			"psubusw %%mm3, %%mm2 \n\t"
 			"psrlw $7, %%mm2 \n\t"
-			
+
 			"packuswb %%mm2, %%mm1 \n\t"
 			"movq %%mm1, (%%"REG_D") \n\t"
 			"add $8, %%"REG_D" \n\t"

Modified: trunk/libmpcodecs/vf_tinterlace.c
==============================================================================
--- trunk/libmpcodecs/vf_tinterlace.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_tinterlace.c	Wed May 13 04:58:57 2009	(r29305)
@@ -124,13 +124,13 @@ static int put_image(struct vf_instance_
 		// rate and preserving image height.
 
 		dmpi = vf->priv->dmpi;
-		
+
 		// @@ Need help:  Should I set dmpi->fields to indicate
 		// that the (new) frame will be interlaced!?  E.g. ...
 		// dmpi->fields |= MP_IMGFIELD_INTERLACED;
 		// dmpi->fields |= MP_IMGFIELD_TOP_FIRST;
 		// etc.
-		
+
 		if (dmpi == NULL) {
 			dmpi = vf_get_image(vf->next, mpi->imgfmt,
 					    MP_IMGTYPE_STATIC, MP_IMGFLAG_ACCEPT_STRIDE |
@@ -152,16 +152,16 @@ static int put_image(struct vf_instance_
 		} else {
 			vf->priv->dmpi = NULL;
 
-			my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0], 
+			my_memcpy_pic(dmpi->planes[0]+dmpi->stride[0],
 				      mpi->planes[0]+mpi->stride[0],
-				      mpi->w, mpi->h/2, 
+				      mpi->w, mpi->h/2,
 				      dmpi->stride[0]*2, mpi->stride[0]*2);
 			if (mpi->flags & MP_IMGFLAG_PLANAR) {
-				my_memcpy_pic(dmpi->planes[1]+dmpi->stride[1], 
+				my_memcpy_pic(dmpi->planes[1]+dmpi->stride[1],
 					      mpi->planes[1]+mpi->stride[1],
 					      mpi->chroma_width, mpi->chroma_height/2,
 					      dmpi->stride[1]*2, mpi->stride[1]*2);
-				my_memcpy_pic(dmpi->planes[2]+dmpi->stride[2], 
+				my_memcpy_pic(dmpi->planes[2]+dmpi->stride[2],
 					      mpi->planes[2]+mpi->stride[2],
 					      mpi->chroma_width, mpi->chroma_height/2,
 					      dmpi->stride[2]*2, mpi->stride[2]*2);

Modified: trunk/libmpcodecs/vf_unsharp.c
==============================================================================
--- trunk/libmpcodecs/vf_unsharp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_unsharp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -85,7 +85,7 @@ static void unsharp( uint8_t *dst, uint8
     if( !fp->amount ) {
 	if( src == dst )
 	    return;
-	if( dstStride == srcStride ) 
+	if( dstStride == srcStride )
 	    fast_memcpy( dst, src, srcStride*height );
 	else
 	    for( y=0; y<height; y++, dst+=dstStride, src+=srcStride )
@@ -112,7 +112,7 @@ static void unsharp( uint8_t *dst, uint8
 	    if( x>=stepsX && y>=stepsY ) {
 		uint8_t* srx = src - stepsY*srcStride + x - stepsX;
 		uint8_t* dsx = dst - stepsY*dstStride + x - stepsX;
-		
+
 		res = (int32_t)*srx + ( ( ( (int32_t)*srx - (int32_t)((Tmp1+halfscale) >> scalebits) ) * amount ) >> 16 );
 		*dsx = res>255 ? 255 : res<0 ? 0 : (uint8_t)res;
 	    }
@@ -160,7 +160,7 @@ static int config( struct vf_instance_s*
 //===========================================================================//
 
 static void get_image( struct vf_instance_s* vf, mp_image_t *mpi ) {
-    if( mpi->flags & MP_IMGFLAG_PRESERVE ) 
+    if( mpi->flags & MP_IMGFLAG_PRESERVE )
 	return; // don't change
     if( mpi->imgfmt!=vf->priv->outfmt )
 	return; // colorspace differ
@@ -185,13 +185,13 @@ static int put_image( struct vf_instance
 	// no DR, so get a new image! hope we'll get DR buffer:
 	vf->dmpi = vf_get_image( vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h);
     dmpi= vf->dmpi;
-    
+
     unsharp( dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w,   mpi->h,   &vf->priv->lumaParam );
     unsharp( dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w/2, mpi->h/2, &vf->priv->chromaParam );
     unsharp( dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w/2, mpi->h/2, &vf->priv->chromaParam );
-    
+
     vf_clone_mpi_attributes(dmpi, mpi);
-    
+
 #if HAVE_MMX
     if(gCpuCaps.hasMMX)
 	__asm__ volatile ("emms\n\t");
@@ -200,7 +200,7 @@ static int put_image( struct vf_instance
     if(gCpuCaps.hasMMX2)
 	__asm__ volatile ("sfence\n\t");
 #endif
-    
+
     return vf_next_put_image( vf, dmpi, pts);
 }
 
@@ -284,17 +284,17 @@ static int open( vf_instance_t *vf, char
 	if( args2 )
 	    parse( &vf->priv->lumaParam, args2 );
 	else {
-	    vf->priv->lumaParam.amount = 
-	    vf->priv->lumaParam.msizeX = 
+	    vf->priv->lumaParam.amount =
+	    vf->priv->lumaParam.msizeX =
 	    vf->priv->lumaParam.msizeY = 0;
 	}
 
 	args2 = strchr( args, 'c' );
-	if( args2 ) 
+	if( args2 )
 	    parse( &vf->priv->chromaParam, args2 );
 	else {
-	    vf->priv->chromaParam.amount = 
-	    vf->priv->chromaParam.msizeX = 
+	    vf->priv->chromaParam.amount =
+	    vf->priv->chromaParam.msizeX =
 	    vf->priv->chromaParam.msizeY = 0;
 	}
 

Modified: trunk/libmpcodecs/vf_uspp.c
==============================================================================
--- trunk/libmpcodecs/vf_uspp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_uspp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -54,46 +54,46 @@ static const uint8_t  __attribute__((ali
 };
 
 static const uint8_t offset[511][2]= {
-{ 0, 0}, 
-{ 0, 0}, { 8, 8}, 
-{ 0, 0}, { 4, 4}, {12, 8}, { 8,12}, 
-{ 0, 0}, {10, 2}, { 4, 4}, {14, 6}, { 8, 8}, { 2,10}, {12,12}, { 6,14}, 
+{ 0, 0},
+{ 0, 0}, { 8, 8},
+{ 0, 0}, { 4, 4}, {12, 8}, { 8,12},
+{ 0, 0}, {10, 2}, { 4, 4}, {14, 6}, { 8, 8}, { 2,10}, {12,12}, { 6,14},
 
-{ 0, 0}, {10, 2}, { 4, 4}, {14, 6}, { 8, 8}, { 2,10}, {12,12}, { 6,14}, 
+{ 0, 0}, {10, 2}, { 4, 4}, {14, 6}, { 8, 8}, { 2,10}, {12,12}, { 6,14},
 { 5, 1}, {15, 3}, { 9, 5}, { 3, 7}, {13, 9}, { 7,11}, { 1,13}, {11,15},
 
-{ 0, 0}, { 8, 0}, { 0, 8}, { 8, 8}, { 5, 1}, {13, 1}, { 5, 9}, {13, 9}, 
-{ 2, 2}, {10, 2}, { 2,10}, {10,10}, { 7, 3}, {15, 3}, { 7,11}, {15,11}, 
-{ 4, 4}, {12, 4}, { 4,12}, {12,12}, { 1, 5}, { 9, 5}, { 1,13}, { 9,13}, 
-{ 6, 6}, {14, 6}, { 6,14}, {14,14}, { 3, 7}, {11, 7}, { 3,15}, {11,15}, 
+{ 0, 0}, { 8, 0}, { 0, 8}, { 8, 8}, { 5, 1}, {13, 1}, { 5, 9}, {13, 9},
+{ 2, 2}, {10, 2}, { 2,10}, {10,10}, { 7, 3}, {15, 3}, { 7,11}, {15,11},
+{ 4, 4}, {12, 4}, { 4,12}, {12,12}, { 1, 5}, { 9, 5}, { 1,13}, { 9,13},
+{ 6, 6}, {14, 6}, { 6,14}, {14,14}, { 3, 7}, {11, 7}, { 3,15}, {11,15},
 
-{ 0, 0}, { 8, 0}, { 0, 8}, { 8, 8}, { 4, 0}, {12, 0}, { 4, 8}, {12, 8}, 
-{ 1, 1}, { 9, 1}, { 1, 9}, { 9, 9}, { 5, 1}, {13, 1}, { 5, 9}, {13, 9}, 
-{ 3, 2}, {11, 2}, { 3,10}, {11,10}, { 7, 2}, {15, 2}, { 7,10}, {15,10}, 
-{ 2, 3}, {10, 3}, { 2,11}, {10,11}, { 6, 3}, {14, 3}, { 6,11}, {14,11}, 
-{ 0, 4}, { 8, 4}, { 0,12}, { 8,12}, { 4, 4}, {12, 4}, { 4,12}, {12,12}, 
-{ 1, 5}, { 9, 5}, { 1,13}, { 9,13}, { 5, 5}, {13, 5}, { 5,13}, {13,13}, 
-{ 3, 6}, {11, 6}, { 3,14}, {11,14}, { 7, 6}, {15, 6}, { 7,14}, {15,14}, 
-{ 2, 7}, {10, 7}, { 2,15}, {10,15}, { 6, 7}, {14, 7}, { 6,15}, {14,15}, 
+{ 0, 0}, { 8, 0}, { 0, 8}, { 8, 8}, { 4, 0}, {12, 0}, { 4, 8}, {12, 8},
+{ 1, 1}, { 9, 1}, { 1, 9}, { 9, 9}, { 5, 1}, {13, 1}, { 5, 9}, {13, 9},
+{ 3, 2}, {11, 2}, { 3,10}, {11,10}, { 7, 2}, {15, 2}, { 7,10}, {15,10},
+{ 2, 3}, {10, 3}, { 2,11}, {10,11}, { 6, 3}, {14, 3}, { 6,11}, {14,11},
+{ 0, 4}, { 8, 4}, { 0,12}, { 8,12}, { 4, 4}, {12, 4}, { 4,12}, {12,12},
+{ 1, 5}, { 9, 5}, { 1,13}, { 9,13}, { 5, 5}, {13, 5}, { 5,13}, {13,13},
+{ 3, 6}, {11, 6}, { 3,14}, {11,14}, { 7, 6}, {15, 6}, { 7,14}, {15,14},
+{ 2, 7}, {10, 7}, { 2,15}, {10,15}, { 6, 7}, {14, 7}, { 6,15}, {14,15},
 
-{ 0, 0}, { 8, 0}, { 0, 8}, { 8, 8}, { 0, 2}, { 8, 2}, { 0,10}, { 8,10}, 
-{ 0, 4}, { 8, 4}, { 0,12}, { 8,12}, { 0, 6}, { 8, 6}, { 0,14}, { 8,14}, 
-{ 1, 1}, { 9, 1}, { 1, 9}, { 9, 9}, { 1, 3}, { 9, 3}, { 1,11}, { 9,11}, 
-{ 1, 5}, { 9, 5}, { 1,13}, { 9,13}, { 1, 7}, { 9, 7}, { 1,15}, { 9,15}, 
-{ 2, 0}, {10, 0}, { 2, 8}, {10, 8}, { 2, 2}, {10, 2}, { 2,10}, {10,10}, 
-{ 2, 4}, {10, 4}, { 2,12}, {10,12}, { 2, 6}, {10, 6}, { 2,14}, {10,14}, 
-{ 3, 1}, {11, 1}, { 3, 9}, {11, 9}, { 3, 3}, {11, 3}, { 3,11}, {11,11}, 
-{ 3, 5}, {11, 5}, { 3,13}, {11,13}, { 3, 7}, {11, 7}, { 3,15}, {11,15}, 
-{ 4, 0}, {12, 0}, { 4, 8}, {12, 8}, { 4, 2}, {12, 2}, { 4,10}, {12,10}, 
-{ 4, 4}, {12, 4}, { 4,12}, {12,12}, { 4, 6}, {12, 6}, { 4,14}, {12,14}, 
-{ 5, 1}, {13, 1}, { 5, 9}, {13, 9}, { 5, 3}, {13, 3}, { 5,11}, {13,11}, 
-{ 5, 5}, {13, 5}, { 5,13}, {13,13}, { 5, 7}, {13, 7}, { 5,15}, {13,15}, 
-{ 6, 0}, {14, 0}, { 6, 8}, {14, 8}, { 6, 2}, {14, 2}, { 6,10}, {14,10}, 
-{ 6, 4}, {14, 4}, { 6,12}, {14,12}, { 6, 6}, {14, 6}, { 6,14}, {14,14}, 
-{ 7, 1}, {15, 1}, { 7, 9}, {15, 9}, { 7, 3}, {15, 3}, { 7,11}, {15,11}, 
-{ 7, 5}, {15, 5}, { 7,13}, {15,13}, { 7, 7}, {15, 7}, { 7,15}, {15,15}, 
+{ 0, 0}, { 8, 0}, { 0, 8}, { 8, 8}, { 0, 2}, { 8, 2}, { 0,10}, { 8,10},
+{ 0, 4}, { 8, 4}, { 0,12}, { 8,12}, { 0, 6}, { 8, 6}, { 0,14}, { 8,14},
+{ 1, 1}, { 9, 1}, { 1, 9}, { 9, 9}, { 1, 3}, { 9, 3}, { 1,11}, { 9,11},
+{ 1, 5}, { 9, 5}, { 1,13}, { 9,13}, { 1, 7}, { 9, 7}, { 1,15}, { 9,15},
+{ 2, 0}, {10, 0}, { 2, 8}, {10, 8}, { 2, 2}, {10, 2}, { 2,10}, {10,10},
+{ 2, 4}, {10, 4}, { 2,12}, {10,12}, { 2, 6}, {10, 6}, { 2,14}, {10,14},
+{ 3, 1}, {11, 1}, { 3, 9}, {11, 9}, { 3, 3}, {11, 3}, { 3,11}, {11,11},
+{ 3, 5}, {11, 5}, { 3,13}, {11,13}, { 3, 7}, {11, 7}, { 3,15}, {11,15},
+{ 4, 0}, {12, 0}, { 4, 8}, {12, 8}, { 4, 2}, {12, 2}, { 4,10}, {12,10},
+{ 4, 4}, {12, 4}, { 4,12}, {12,12}, { 4, 6}, {12, 6}, { 4,14}, {12,14},
+{ 5, 1}, {13, 1}, { 5, 9}, {13, 9}, { 5, 3}, {13, 3}, { 5,11}, {13,11},
+{ 5, 5}, {13, 5}, { 5,13}, {13,13}, { 5, 7}, {13, 7}, { 5,15}, {13,15},
+{ 6, 0}, {14, 0}, { 6, 8}, {14, 8}, { 6, 2}, {14, 2}, { 6,10}, {14,10},
+{ 6, 4}, {14, 4}, { 6,12}, {14,12}, { 6, 6}, {14, 6}, { 6,14}, {14,14},
+{ 7, 1}, {15, 1}, { 7, 9}, {15, 9}, { 7, 3}, {15, 3}, { 7,11}, {15,11},
+{ 7, 5}, {15, 5}, { 7,13}, {15,13}, { 7, 7}, {15, 7}, { 7,15}, {15,15},
 
-{ 0, 0}, { 8, 0}, { 0, 8}, { 8, 8}, { 4, 4}, {12, 4}, { 4,12}, {12,12}, { 0, 4}, { 8, 4}, { 0,12}, { 8,12}, { 4, 0}, {12, 0}, { 4, 8}, {12, 8}, { 2, 2}, {10, 2}, { 2,10}, {10,10}, { 6, 6}, {14, 6}, { 6,14}, {14,14}, { 2, 6}, {10, 6}, { 2,14}, {10,14}, { 6, 2}, {14, 2}, { 6,10}, {14,10}, { 0, 2}, { 8, 2}, { 0,10}, { 8,10}, { 4, 6}, {12, 6}, { 4,14}, {12,14}, { 0, 6}, { 8, 6}, { 0,14}, { 8,14}, { 4, 2}, {12, 2}, { 4,10}, {12,10}, { 2, 0}, {10, 0}, { 2, 8}, {10, 8}, { 6, 4}, {14, 4}, { 6,12}, {14,12}, { 2, 4}, {10, 4}, { 2,12}, {10,12}, { 6, 0}, {14, 0}, { 6, 8}, {14, 8}, { 1, 1}, { 9, 1}, { 1, 9}, { 9, 9}, { 5, 5}, {13, 5}, { 5,13}, {13,13}, { 1, 5}, { 9, 5}, { 1,13}, { 9,13}, { 5, 1}, {13, 1}, { 5, 9}, {13, 9}, { 3, 3}, {11, 3}, { 3,11}, {11,11}, { 7, 7}, {15, 7}, { 7,15}, {15,15}, { 3, 7}, {11, 7}, { 3,15}, {11,15}, { 7, 3}, {15, 3}, { 7,11}, {15,11}, { 1, 3}, { 9, 3}, { 1,11}, { 9,11}, { 5, 7}, {13, 7}, { 5,15}, {13,15}, { 1, 7}, { 9, 7}, { 1,15}, { 9,15}, { 5, 3}, {13, 3},
  { 5,11}, {13,11}, { 3, 1}, {11, 1}, { 3, 9}, {11, 9}, { 7, 5}, {15, 5}, { 7,13}, {15,13}, { 3, 5}, {11, 5}, { 3,13}, {11,13}, { 7, 1}, {15, 1}, { 7, 9}, {15, 9}, { 0, 1}, { 8, 1}, { 0, 9}, { 8, 9}, { 4, 5}, {12, 5}, { 4,13}, {12,13}, { 0, 5}, { 8, 5}, { 0,13}, { 8,13}, { 4, 1}, {12, 1}, { 4, 9}, {12, 9}, { 2, 3}, {10, 3}, { 2,11}, {10,11}, { 6, 7}, {14, 7}, { 6,15}, {14,15}, { 2, 7}, {10, 7}, { 2,15}, {10,15}, { 6, 3}, {14, 3}, { 6,11}, {14,11}, { 0, 3}, { 8, 3}, { 0,11}, { 8,11}, { 4, 7}, {12, 7}, { 4,15}, {12,15}, { 0, 7}, { 8, 7}, { 0,15}, { 8,15}, { 4, 3}, {12, 3}, { 4,11}, {12,11}, { 2, 1}, {10, 1}, { 2, 9}, {10, 9}, { 6, 5}, {14, 5}, { 6,13}, {14,13}, { 2, 5}, {10, 5}, { 2,13}, {10,13}, { 6, 1}, {14, 1}, { 6, 9}, {14, 9}, { 1, 0}, { 9, 0}, { 1, 8}, { 9, 8}, { 5, 4}, {13, 4}, { 5,12}, {13,12}, { 1, 4}, { 9, 4}, { 1,12}, { 9,12}, { 5, 0}, {13, 0}, { 5, 8}, {13, 8}, { 3, 2}, {11, 2}, { 3,10}, {11,10}, { 7, 6}, {15, 6}, { 7,14}, {15,14}, { 3, 6}, {11, 6}, { 3,14}, {11,14}
 , { 7, 2}, {15, 2}, { 7,10}, {15,10}, { 1, 2}, { 9, 2}, { 1,10}, { 9,10}, { 5, 6}, {13, 6}, { 5,14}, {13,14}, { 1, 6}, { 9, 6}, { 1,14}, { 9,14}, { 5, 2}, {13, 2}, { 5,10}, {13,10}, { 3, 0}, {11, 0}, { 3, 8}, {11, 8}, { 7, 4}, {15, 4}, { 7,12}, {15,12}, { 3, 4}, {11, 4}, { 3,12}, {11,12}, { 7, 0}, {15, 0}, { 7, 8}, {15, 8}, 
+{ 0, 0}, { 8, 0}, { 0, 8}, { 8, 8}, { 4, 4}, {12, 4}, { 4,12}, {12,12}, { 0, 4}, { 8, 4}, { 0,12}, { 8,12}, { 4, 0}, {12, 0}, { 4, 8}, {12, 8}, { 2, 2}, {10, 2}, { 2,10}, {10,10}, { 6, 6}, {14, 6}, { 6,14}, {14,14}, { 2, 6}, {10, 6}, { 2,14}, {10,14}, { 6, 2}, {14, 2}, { 6,10}, {14,10}, { 0, 2}, { 8, 2}, { 0,10}, { 8,10}, { 4, 6}, {12, 6}, { 4,14}, {12,14}, { 0, 6}, { 8, 6}, { 0,14}, { 8,14}, { 4, 2}, {12, 2}, { 4,10}, {12,10}, { 2, 0}, {10, 0}, { 2, 8}, {10, 8}, { 6, 4}, {14, 4}, { 6,12}, {14,12}, { 2, 4}, {10, 4}, { 2,12}, {10,12}, { 6, 0}, {14, 0}, { 6, 8}, {14, 8}, { 1, 1}, { 9, 1}, { 1, 9}, { 9, 9}, { 5, 5}, {13, 5}, { 5,13}, {13,13}, { 1, 5}, { 9, 5}, { 1,13}, { 9,13}, { 5, 1}, {13, 1}, { 5, 9}, {13, 9}, { 3, 3}, {11, 3}, { 3,11}, {11,11}, { 7, 7}, {15, 7}, { 7,15}, {15,15}, { 3, 7}, {11, 7}, { 3,15}, {11,15}, { 7, 3}, {15, 3}, { 7,11}, {15,11}, { 1, 3}, { 9, 3}, { 1,11}, { 9,11}, { 5, 7}, {13, 7}, { 5,15}, {13,15}, { 1, 7}, { 9, 7}, { 1,15}, { 9,15}, { 5, 3}, {13, 3},
  { 5,11}, {13,11}, { 3, 1}, {11, 1}, { 3, 9}, {11, 9}, { 7, 5}, {15, 5}, { 7,13}, {15,13}, { 3, 5}, {11, 5}, { 3,13}, {11,13}, { 7, 1}, {15, 1}, { 7, 9}, {15, 9}, { 0, 1}, { 8, 1}, { 0, 9}, { 8, 9}, { 4, 5}, {12, 5}, { 4,13}, {12,13}, { 0, 5}, { 8, 5}, { 0,13}, { 8,13}, { 4, 1}, {12, 1}, { 4, 9}, {12, 9}, { 2, 3}, {10, 3}, { 2,11}, {10,11}, { 6, 7}, {14, 7}, { 6,15}, {14,15}, { 2, 7}, {10, 7}, { 2,15}, {10,15}, { 6, 3}, {14, 3}, { 6,11}, {14,11}, { 0, 3}, { 8, 3}, { 0,11}, { 8,11}, { 4, 7}, {12, 7}, { 4,15}, {12,15}, { 0, 7}, { 8, 7}, { 0,15}, { 8,15}, { 4, 3}, {12, 3}, { 4,11}, {12,11}, { 2, 1}, {10, 1}, { 2, 9}, {10, 9}, { 6, 5}, {14, 5}, { 6,13}, {14,13}, { 2, 5}, {10, 5}, { 2,13}, {10,13}, { 6, 1}, {14, 1}, { 6, 9}, {14, 9}, { 1, 0}, { 9, 0}, { 1, 8}, { 9, 8}, { 5, 4}, {13, 4}, { 5,12}, {13,12}, { 1, 4}, { 9, 4}, { 1,12}, { 9,12}, { 5, 0}, {13, 0}, { 5, 8}, {13, 8}, { 3, 2}, {11, 2}, { 3,10}, {11,10}, { 7, 6}, {15, 6}, { 7,14}, {15,14}, { 3, 6}, {11, 6}, { 3,14}, {11,14}
 , { 7, 2}, {15, 2}, { 7,10}, {15,10}, { 1, 2}, { 9, 2}, { 1,10}, { 9,10}, { 5, 6}, {13, 6}, { 5,14}, {13,14}, { 1, 6}, { 9, 6}, { 1,14}, { 9,14}, { 5, 2}, {13, 2}, { 5,10}, {13,10}, { 3, 0}, {11, 0}, { 3, 8}, {11, 8}, { 7, 4}, {15, 4}, { 7,12}, {15,12}, { 3, 4}, {11, 4}, { 3,12}, {11,12}, { 7, 0}, {15, 0}, { 7, 8}, {15, 8},
 };
 
 struct vf_priv_s {
@@ -146,12 +146,12 @@ static void filter(struct vf_priv_s *p, 
         int stride= p->temp_stride[i];
         int block= BLOCK>>is_chroma;
 
-        if (!src[i] || !dst[i]) 
+        if (!src[i] || !dst[i])
             continue; // HACK avoid crash for Y8 colourspace
         for(y=0; y<h; y++){
             int index= block + block*stride + y*stride;
             fast_memcpy(p->src[i] + index, src[i] + y*src_stride[i], w);
-            for(x=0; x<block; x++){ 
+            for(x=0; x<block; x++){
                 p->src[i][index     - x - 1]= p->src[i][index +     x    ];
                 p->src[i][index + w + x    ]= p->src[i][index + w - x - 1];
             }
@@ -343,7 +343,7 @@ static int control(struct vf_instance_s*
 static int open(vf_instance_t *vf, char* args){
 
     int log2c=-1;
-    
+
     vf->config=config;
     vf->put_image=put_image;
     vf->get_image=get_image;
@@ -352,12 +352,12 @@ static int open(vf_instance_t *vf, char*
     vf->control= control;
     vf->priv=malloc(sizeof(struct vf_priv_s));
     memset(vf->priv, 0, sizeof(struct vf_priv_s));
-    
+
     avcodec_init();
     avcodec_register_all();
-    
+
     vf->priv->log2_count= 4;
-    
+
     if (args) sscanf(args, "%d:%d:%d", &log2c, &vf->priv->qp, &vf->priv->mode);
 
     if( log2c >=0 && log2c <=8 )

Modified: trunk/libmpcodecs/vf_yuvcsp.c
==============================================================================
--- trunk/libmpcodecs/vf_yuvcsp.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_yuvcsp.c	Wed May 13 04:58:57 2009	(r29305)
@@ -38,7 +38,7 @@ static int put_image(struct vf_instance_
     vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
 	MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
 	mpi->width, mpi->height);
-    
+
     y_in = mpi->planes[0];
     cb_in = mpi->planes[1];
     cr_in = mpi->planes[2];
@@ -46,7 +46,7 @@ static int put_image(struct vf_instance_
     y_out = vf->dmpi->planes[0];
     cb_out = vf->dmpi->planes[1];
     cr_out = vf->dmpi->planes[2];
-    
+
     for (i = 0; i < mpi->height; i++)
 	for (j = 0; j < mpi->width; j++)
 	    y_out[i*vf->dmpi->stride[0]+j] = clamp_y(y_in[i*mpi->stride[0]+j]);
@@ -57,7 +57,7 @@ static int put_image(struct vf_instance_
 	    cb_out[i*vf->dmpi->stride[1]+j] = clamp_c(cb_in[i*mpi->stride[1]+j]);
 	    cr_out[i*vf->dmpi->stride[2]+j] = clamp_c(cr_in[i*mpi->stride[2]+j]);
 	}
-    
+
     return vf_next_put_image(vf,vf->dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_yuy2.c
==============================================================================
--- trunk/libmpcodecs/vf_yuy2.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_yuy2.c	Wed May 13 04:58:57 2009	(r29305)
@@ -21,12 +21,12 @@ static int config(struct vf_instance_s* 
 	unsigned int flags, unsigned int outfmt){
 
     sws_rgb2rgb_init(get_sws_cpuflags());
-    
+
     if(vf_next_query_format(vf,IMGFMT_YUY2)<=0){
 	mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_WarnNextFilterDoesntSupport, "YUY2");
 	return 0;
     }
-    
+
     return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YUY2);
 }
 
@@ -44,9 +44,9 @@ static int put_image(struct vf_instance_
     else
     yv12toyuy2(mpi->planes[0],mpi->planes[1],mpi->planes[2], dmpi->planes[0],
 	    mpi->w,mpi->h, mpi->stride[0],mpi->stride[1],dmpi->stride[0]);
-    
+
     vf_clone_mpi_attributes(dmpi, mpi);
-    
+
     return vf_next_put_image(vf,dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vf_yvu9.c
==============================================================================
--- trunk/libmpcodecs/vf_yvu9.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vf_yvu9.c	Wed May 13 04:58:57 2009	(r29305)
@@ -18,12 +18,12 @@
 static int config(struct vf_instance_s* vf,
         int width, int height, int d_width, int d_height,
 	unsigned int flags, unsigned int outfmt){
-    
+
     if(vf_next_query_format(vf,IMGFMT_YV12)<=0){
 	mp_msg(MSGT_VFILTER, MSGL_WARN, MSGTR_MPCODECS_WarnNextFilterDoesntSupport, "YVU9");
 	return 0;
     }
-    
+
     return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YV12);
 }
 
@@ -56,7 +56,7 @@ static int put_image(struct vf_instance_
     }
 
     vf_clone_mpi_attributes(dmpi, mpi);
-    
+
     return vf_next_put_image(vf,dmpi, pts);
 }
 

Modified: trunk/libmpcodecs/vqf.h
==============================================================================
--- trunk/libmpcodecs/vqf.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpcodecs/vqf.h	Wed May 13 04:58:57 2009	(r29305)
@@ -215,9 +215,9 @@ typedef struct {
 
 #ifdef V2PLUS_SUPPORT
 // TwinVQ FB coding tool control
-DllPort void  TvqFbCountUsedBits(int nbit);  // count number of used bits 
+DllPort void  TvqFbCountUsedBits(int nbit);  // count number of used bits
 DllPort float TvqGetFbCurrentBitrate(void);  // query average bitrate for the tool
-DllPort int   TvqGetFbTotalBits(void);  // query total number of used bits 
+DllPort int   TvqGetFbTotalBits(void);  // query total number of used bits
 #endif
 
 #ifdef __cplusplus

Modified: trunk/libmpdemux/aac_hdr.c
==============================================================================
--- trunk/libmpdemux/aac_hdr.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpdemux/aac_hdr.c	Wed May 13 04:58:57 2009	(r29305)
@@ -31,10 +31,10 @@ int aac_parse_frame(uint8_t *buf, int *s
 {
 	int i = 0, sr, fl = 0, id;
 	static int srates[] = {96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 0, 0, 0};
-	
+
 	if((buf[i] != 0xFF) || ((buf[i+1] & 0xF6) != 0xF0))
 		return 0;
-	
+
 	id = (buf[i+1] >> 3) & 0x01;	//id=1 mpeg2, 0: mpeg4
 	sr = (buf[i+2] >> 2)  & 0x0F;
 	if(sr > 11)

Modified: trunk/libmpdemux/asf.h
==============================================================================
--- trunk/libmpdemux/asf.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpdemux/asf.h	Wed May 13 04:58:57 2009	(r29305)
@@ -25,7 +25,7 @@
 #include "mpbswap.h"
 
 ///////////////////////
-// ASF Object Header 
+// ASF Object Header
 ///////////////////////
 typedef struct __attribute__((packed)) {
   uint8_t guid[16];
@@ -33,7 +33,7 @@ typedef struct __attribute__((packed)) {
 } ASF_obj_header_t;
 
 ////////////////
-// ASF Header 
+// ASF Header
 ////////////////
 typedef struct __attribute__((packed)) {
   ASF_obj_header_t objh;
@@ -43,7 +43,7 @@ typedef struct __attribute__((packed)) {
 } ASF_header_t;
 
 /////////////////////
-// ASF File Header 
+// ASF File Header
 /////////////////////
 typedef struct __attribute__((packed)) {
   uint8_t stream_id[16]; // stream GUID
@@ -84,7 +84,7 @@ typedef struct  __attribute__((packed)) 
 } ASF_content_description_t;
 
 ////////////////////////
-// ASF Segment Header 
+// ASF Segment Header
 ////////////////////////
 typedef struct __attribute__((packed)) {
   uint8_t streamno;

Modified: trunk/libmpdemux/asfguid.h
==============================================================================
--- trunk/libmpdemux/asfguid.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpdemux/asfguid.h	Wed May 13 04:58:57 2009	(r29305)
@@ -75,9 +75,9 @@ static const char asf_metadata_header[16
   0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca};
 static const char asf_content_encryption[16] = {0xfb, 0xb3, 0x11, 0x22,
   0x23, 0xbd, 0xd2, 0x11, 0xb4, 0xb7, 0x00, 0xa0, 0xc9, 0x55, 0xfc, 0x6e};
-static const char asf_dvr_ms_timing_rep_data[16] = {0x2a, 0xc0, 0x3c,0xfd,  
+static const char asf_dvr_ms_timing_rep_data[16] = {0x2a, 0xc0, 0x3c,0xfd,
   0xdb, 0x06, 0xfa, 0x4c, 0x80, 0x1c, 0x72, 0x12, 0xd3, 0x87, 0x45, 0xe4};
-static const char asf_dvr_ms_vid_frame_rep_data[16] = {0xcc, 0x32, 0x64, 0xdd, 
+static const char asf_dvr_ms_vid_frame_rep_data[16] = {0xcc, 0x32, 0x64, 0xdd,
   0x29, 0xe2, 0xdb, 0x40, 0x80, 0xf6, 0xd2, 0x63, 0x28, 0xd2, 0x76, 0x1f};
 
 static int find_asf_guid(char *buf, const char *guid, int cur_pos, int buf_len)

Modified: trunk/libmpdemux/asfheader.c
==============================================================================
--- trunk/libmpdemux/asfheader.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpdemux/asfheader.c	Wed May 13 04:58:57 2009	(r29305)
@@ -77,7 +77,7 @@ static const char* asf_chunk_type(unsign
       return "guid_ext_audio_stream";
     case ASF_GUID_PREFIX_ext_stream_embed_stream_header:
       return "guid_ext_stream_embed_stream_header";
-    case ASF_GUID_PREFIX_video_stream: 
+    case ASF_GUID_PREFIX_video_stream:
       return "guid_video_stream";
     case ASF_GUID_PREFIX_audio_conceal_none:
       return "guid_audio_conceal_none";
@@ -91,7 +91,7 @@ static const char* asf_chunk_type(unsign
       return "guid_index_chunk";
     case ASF_GUID_PREFIX_stream_header:
       return "guid_stream_header";
-    case ASF_GUID_PREFIX_header_2_0: 
+    case ASF_GUID_PREFIX_header_2_0:
       return "guid_header_2_0";
     case ASF_GUID_PREFIX_file_header:
       return "guid_file_header";
@@ -179,7 +179,7 @@ static int get_ext_stream_properties(cha
       stnamect = AV_RL16(buffer);buffer+=2;
       payct = AV_RL16(buffer);buffer+=2;
 
-      // need to read stream names if present in order 
+      // need to read stream names if present in order
       // to get lengths - values are ignored for now
       for (i=0; i<stnamect; i++) {
         int stream_name_len;
@@ -331,7 +331,7 @@ static int is_drm(char* buf, int buf_len
   buf += 4;
 
   buf[key_len - 1] = '\0';
-  mp_msg(MSGT_HEADER, MSGL_V, "DRM Key ID: %s\n", buf); 
+  mp_msg(MSGT_HEADER, MSGL_V, "DRM Key ID: %s\n", buf);
 
   buf += key_len;
   url_len = AV_RL32(buf);
@@ -341,7 +341,7 @@ static int is_drm(char* buf, int buf_len
   buf[url_len - 1] = '\0';
   mp_msg(MSGT_HEADER, MSGL_INFO, MSGTR_MPDEMUX_ASFHDR_DRMLicenseURL, buf);
   return 1;
-} 
+}
 
 static int asf_init_audio_stream(demuxer_t *demuxer,struct asf_priv* asf, sh_audio_t* sh_audio, ASF_stream_header_t *streamh, int *ppos, uint8_t** buf, char *hdr, unsigned int hdr_len)
 {
@@ -400,7 +400,7 @@ int read_asf_header(demuxer_t *demuxer,s
     mp_msg(MSGT_HEADER, MSGL_FATAL, "Header size is too small.\n");
     return 0;
   }
-    
+
   if (hdr_len > 1024 * 1024) {
     mp_msg(MSGT_HEADER, MSGL_ERR, MSGTR_MPDEMUX_ASFHDR_HeaderSizeOver1MB,
 			hdr_len);
@@ -431,7 +431,7 @@ int read_asf_header(demuxer_t *demuxer,s
     int sh_pos=0;
 
     sh_pos = find_backwards_asf_guid(hdr, asf_stream_header_guid, pos);
- 
+
     if (sh_pos > 0) {
       sh_audio_t *sh_audio;
 
@@ -455,7 +455,7 @@ int read_asf_header(demuxer_t *demuxer,s
   // find stream headers
   // only reset pos if we didnt find dvr_ms audio stream
   // if we did find it then we want to avoid reading its header twice
-  if (audio_pos == 0) 
+  if (audio_pos == 0)
     pos = 0;
 
   while ((pos = find_asf_guid(hdr, asf_stream_header_guid, pos, hdr_len)) >= 0)
@@ -538,7 +538,7 @@ int read_asf_header(demuxer_t *demuxer,s
       mp_msg(MSGT_HEADER, MSGL_V, "ASF: packets: %d  flags: %d  "
               "max_packet_size: %d  min_packet_size: %d  max_bitrate: %d  "
               "preroll: %d\n",
-              (int)fileh->num_packets, (int)fileh->flags, 
+              (int)fileh->num_packets, (int)fileh->flags,
               (int)fileh->min_packet_size, (int)fileh->max_packet_size,
               (int)fileh->max_bitrate, (int)fileh->preroll);
       asf->packetsize=fileh->max_packet_size;
@@ -569,7 +569,7 @@ int read_asf_header(demuxer_t *demuxer,s
             free(string);
           }
         }
-        // extract the author 
+        // extract the author
         if((len = contenth->author_size) != 0) {
           wstring = (uint16_t*)&hdr[pos];
           pos += len;
@@ -614,7 +614,7 @@ int read_asf_header(demuxer_t *demuxer,s
         }
 	mp_msg(MSGT_HEADER,MSGL_V,"\n");
   }
-  
+
   // find content header
   pos = find_asf_guid(hdr, asf_stream_group_guid, 0, hdr_len);
   if (pos >= 0) {
@@ -696,7 +696,7 @@ else if(best_audio > 0 && demuxer->audio
 if(!video_streams){
     if(!audio_streams){
 	mp_msg(MSGT_HEADER,MSGL_ERR,MSGTR_MPDEMUX_ASFHDR_AudioVideoHeaderNotFound);
-	return 0; 
+	return 0;
     }
     demuxer->video->id=-2; // audio-only
 } else if (best_video > 0 && demuxer->video->id == -1) demuxer->video->id = best_video;

Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpdemux/aviheader.c	Wed May 13 04:58:57 2009	(r29305)
@@ -247,9 +247,9 @@ while(1){
       *(uint32_t *)s->dwChunkId = stream_read_dword_le(demuxer->stream);
       stream_read(demuxer->stream, (char *)s->dwReserved, 3*4);
       memset(s->dwReserved, 0, 3*4);
-	  
+
       print_avisuperindex_chunk(s,MSGL_V);
-      
+
       // Check and fix this useless crap
       if(s->wLongsPerEntry != sizeof (avisuperindex_entry)/4) {
           mp_msg (MSGT_HEADER, MSGL_WARN, "Broken super index chunk size: %u\n",s->wLongsPerEntry);
@@ -269,7 +269,7 @@ while(1){
 	  s->aIndex[i].qwOffset = stream_read_qword_le(demuxer->stream);
 	  s->aIndex[i].dwSize = stream_read_dword_le(demuxer->stream);
 	  s->aIndex[i].dwDuration = stream_read_dword_le(demuxer->stream);
-	  mp_msg (MSGT_HEADER, MSGL_V, "ODML (%.4s): [%d] 0x%016"PRIx64" 0x%04x %u\n", 
+	  mp_msg (MSGT_HEADER, MSGL_V, "ODML (%.4s): [%d] 0x%016"PRIx64" 0x%04x %u\n",
 		  (s->dwChunkId), i,
 		  (uint64_t)s->aIndex[i].qwOffset, s->aIndex[i].dwSize, s->aIndex[i].dwDuration);
       }
@@ -459,7 +459,7 @@ while(1){
   } else
   if(chunksize>0) stream_skip(demuxer->stream,chunksize); else
   if((int)chunksize<0) mp_msg(MSGT_HEADER,MSGL_WARN,"chunksize=%u  (id=%.4s)\n",chunksize,(char *) &id);
-  
+
 }
 
 if (priv->suidx_size > 0 && priv->idx_size == 0) {
@@ -504,7 +504,7 @@ if (priv->isodml && (index_mode==-1 || i
 	    print_avistdindex_chunk(&cx->stdidx[j],MSGL_V);
 	    priv->idx_size += cx->stdidx[j].nEntriesInUse;
 	    cx->stdidx[j].aIndex = malloc(cx->stdidx[j].nEntriesInUse*sizeof(avistdindex_entry));
-	    stream_read(demuxer->stream, (char *)cx->stdidx[j].aIndex, 
+	    stream_read(demuxer->stream, (char *)cx->stdidx[j].aIndex,
 		    cx->stdidx[j].nEntriesInUse*sizeof(avistdindex_entry));
 	    for (k=0;k<cx->stdidx[j].nEntriesInUse; k++)
 		le2me_AVISTDIDXENTRY(&cx->stdidx[j].aIndex[k]);
@@ -635,7 +635,7 @@ if(index_mode>=2 || (priv->idx_size==0 &
   // build index for file:
   stream_reset(demuxer->stream);
   stream_seek(demuxer->stream,demuxer->movi_start);
-  
+
   priv->idx_pos=0;
   priv->idx_size=0;
   priv->idx=NULL;
@@ -669,7 +669,7 @@ if(index_mode>=2 || (priv->idx_size==0 &
     idx->dwFlags|=(demuxer->filepos>>16)&0xffff0000U;
     idx->dwChunkOffset=(unsigned long)demuxer->filepos;
     idx->dwChunkLength=len;
-    
+
     c=stream_read_dword(demuxer->stream);
 
     if(!len) idx->dwFlags&=~AVIIF_KEYFRAME;

Modified: trunk/libmpdemux/aviheader.h
==============================================================================
--- trunk/libmpdemux/aviheader.h	Tue May 12 21:25:35 2009	(r29304)
+++ trunk/libmpdemux/aviheader.h	Wed May 13 04:58:57 2009	(r29305)
@@ -90,10 +90,10 @@ typedef struct
     uint32_t		dwInitialFrames;
     uint32_t		dwStreams;
     uint32_t		dwSuggestedBufferSize;
-    
+
     uint32_t		dwWidth;
     uint32_t		dwHeight;
-    
+
     uint32_t		dwReserved[4];
 } MainAVIHeader;
 
@@ -111,7 +111,7 @@ typedef struct {
     uint16_t		wPriority;
     uint16_t		wLanguage;
     uint32_t		dwInitialFrames;
-    uint32_t		dwScale;	
+    uint32_t		dwScale;
     uint32_t		dwRate;	/* dwRate / dwScale == samples/second */
     uint32_t		dwStart;
     uint32_t		dwLength; /* In units above... */
@@ -151,7 +151,7 @@ typedef struct avistdindex_entry {
     uint32_t dwSize;             // bit 31 is set if this is NOT a keyframe
 } avistdindex_entry;
 
-// Standard index 
+// Standard index
 typedef struct __attribute__((packed)) avistdindex_chunk {
     char           fcc[4];       // ix##
     uint32_t  dwSize;            // size of this chunk
@@ -164,7 +164,7 @@ typedef struct __attribute__((packed)) a
     uint32_t  dwReserved3;       // must be 0
     avistdindex_entry *aIndex;   // the actual frames
 } avistdindex_chunk;
-    
+
 
 // Base Index Form 'indx'
 typedef struct avisuperindex_chunk {

Modified: trunk/libmpdemux/aviprint.c
=