Public Git Hosting - mplayer.git/commit

commit	a41db36b22053c2cf103899f3510f68ff5645662
author	Uoti Urpala <uau@symbol.nonexistent.invalid>
	Thu, 15 May 2008 18:19:35 +0000 (15 21:19 +0300)
committer	Uoti Urpala <uau@symbol.nonexistent.invalid>
	Thu, 15 May 2008 18:19:35 +0000 (15 21:19 +0300)
tree	e2e3d734a828caf8e1fbf1373d818f06c979e53d	tree \| snapshot (tar.gz zip)
parent	267a3f4c9c00848f32c341595d2d831157a79bee	commit \| diff
parent	84fa3d69f360c87fce4efe6acb128ad78d3647e2	commit \| diff

Merge svn changes up to r26783

Conflicts:

Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c

63 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
common.mak	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
input/ar.c	diff1 \|	diff2 \|	blob \| history
input/ar.h	diff1 \|	diff2 \|	blob \| history
input/input.c	diff1 \|	diff2 \|	blob \| history
libmenu/menu_chapsel.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ad_hwac3.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ad_libdca.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_ffmpeg.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_xvid4.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ve_lavc.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ve_xvid4.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_ass.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_blackframe.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_boxblur.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_delogo.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_denoise3d.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_fspp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_geq.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_hqdn3d.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_il.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_kerndeint.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_mcdeint.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_noise.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_ow.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_perspective.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_pp7.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_qp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_sab.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_scale.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_smartblur.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_spp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_swapuv.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_test.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_tinterlace.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_unsharp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_uspp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_yadif.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_lavf.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_nemesi.c	diff1 \|	diff2 \|	blob \| history
libvo/video_out_internal.h	diff1 \|	diff2 \|	blob \| history
libvo/vo_3dfx.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_directx.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_ivtv.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_jpeg.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_md5sum.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_null.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_pnm.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_sdl.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_v4l2.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xv.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xvmc.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xvr100.c	diff1 \|	diff2 \|	blob \| history
metadata.h	diff1 \|	diff2 \|	blob \| history
mplayer.c	diff1 \|	diff2 \|	blob \| history
options.h	diff1 \|	\|	blob \| history
stream/asf_mmst_streaming.c	diff1 \|	diff2 \|	blob \| history
stream/stream_netstream.c	diff1 \|	diff2 \|	blob \| history
stream/stream_radio.c	diff1 \|	diff2 \|	blob \| history
stream/stream_rtsp.c	diff1 \|	diff2 \|	blob \| history
stream/stream_vstream.c	diff1 \|	diff2 \|	blob \| history

MPlayer development branch

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
common.mak	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
input/ar.c	diff1 \|	diff2 \|	blob \| history
input/ar.h	diff1 \|	diff2 \|	blob \| history
input/input.c	diff1 \|	diff2 \|	blob \| history
libmenu/menu_chapsel.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ad_hwac3.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ad_libdca.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_ffmpeg.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vd_xvid4.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ve_lavc.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/ve_xvid4.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_ass.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_blackframe.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_boxblur.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_delogo.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_denoise3d.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_fspp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_geq.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_hqdn3d.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_il.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_kerndeint.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_mcdeint.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_noise.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_ow.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_perspective.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_pp7.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_qp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_sab.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_scale.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_smartblur.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_spp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_swapuv.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_test.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_tinterlace.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_unsharp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_uspp.c	diff1 \|	diff2 \|	blob \| history
libmpcodecs/vf_yadif.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_lavf.c	diff1 \|	diff2 \|	blob \| history
libmpdemux/demux_nemesi.c	diff1 \|	diff2 \|	blob \| history
libvo/video_out_internal.h	diff1 \|	diff2 \|	blob \| history
libvo/vo_3dfx.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_directx.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_gl.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_ivtv.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_jpeg.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_md5sum.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_null.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_pnm.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_sdl.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_v4l2.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xv.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xvmc.c	diff1 \|	diff2 \|	blob \| history
libvo/vo_xvr100.c	diff1 \|	diff2 \|	blob \| history
metadata.h	diff1 \|	diff2 \|	blob \| history
mplayer.c	diff1 \|	diff2 \|	blob \| history
options.h	diff1 \|	\|	blob \| history
stream/asf_mmst_streaming.c	diff1 \|	diff2 \|	blob \| history
stream/stream_netstream.c	diff1 \|	diff2 \|	blob \| history
stream/stream_radio.c	diff1 \|	diff2 \|	blob \| history
stream/stream_rtsp.c	diff1 \|	diff2 \|	blob \| history
stream/stream_vstream.c	diff1 \|	diff2 \|	blob \| history