Uoti Urpala d5c868325c Merge svn changes up to r26979 ...

Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c

2008-06-04 08:10:48 +03:00

..

native

Add missing MPLAYER_ prefix to multiple inclusion guards.

2008-05-17 10:12:07 +00:00

ad_acm.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_alaw.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_dk3adpcm.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_dmo.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_dshow.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_dvdpcm.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_faad.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_ffmpeg.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_hwac3.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

ad_hwmpa.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_imaadpcm.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_internal.h

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_liba52.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

ad_libdca.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

ad_libdv.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_libmad.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_libvorbis.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_mp3lib.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_mpc.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_msadpcm.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_msgsm.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_pcm.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_qtaudio.c

Merge svn changes up to r26587

2008-04-29 05:03:57 +03:00

ad_realaud.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_sample.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_speex.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad_twin.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

ad.c

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ad.h

Make audio decoder description structs const

2008-04-26 16:51:17 +03:00

ae_faac.c

Fix all current known multi-channel wrong order problems by adding

2007-12-10 16:53:30 +00:00

ae_faac.h

Add necessary header #includes to fix 'make checkheaders'.

2008-03-06 08:34:50 +00:00

ae_lame.c

cosmetics: Remove pointless parentheses from return calls.

2008-05-16 00:23:02 +00:00

ae_lame.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

ae_lavc.c

#include config.h before all other headers.

2008-03-14 16:46:13 +00:00

ae_lavc.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

ae_pcm.c

Fix all current known multi-channel wrong order problems by adding

2007-12-10 16:53:30 +00:00

ae_pcm.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

ae_toolame.c

Add explicit location for headers from the libmpdemux/ directory.

2007-03-15 17:51:32 +00:00

ae_toolame.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

ae_twolame.c

Add explicit location for headers from the libmpdemux/ directory.

2007-03-15 17:51:32 +00:00

ae_twolame.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

ae.c

config.h must be included before other headers

2007-06-24 17:39:54 +00:00

ae.h

Add necessary header #includes to fix 'make checkheaders'.

2008-03-06 08:34:50 +00:00

cmmx.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

dec_audio.c

typo fix: inited --> initialized

2008-02-14 14:23:55 +00:00

dec_audio.h

Add necessary header #includes to fix 'make checkheaders'.

2008-03-06 08:34:50 +00:00

dec_video.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

dec_video.h

Add necessary header #includes to fix 'make checkheaders'.

2008-03-06 08:34:50 +00:00

img_format.c

cosmetics: Remove pointless parentheses from return calls.

2008-05-16 00:23:02 +00:00

img_format.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

mp_image.c

Move alloc_mpi and copy_mpi from libmenu/vf_menu.c to libmpcodecs/mp_image.c.

2007-08-04 22:12:49 +00:00

mp_image.h

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

mpc_info.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

pullup.c

#include config.h before all other headers.

2008-03-14 16:46:13 +00:00

pullup.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

vd_dmo.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_dshow.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_ffmpeg.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vd_hmblck.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_ijpg.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_internal.h

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_libdv.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_libmpeg2.c

Merge svn changes up to r26680

2008-05-07 13:15:37 +03:00

vd_lzo.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_mpegpes.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_mpng.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_mtga.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_null.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_nuv.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_qtvideo.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vd_raw.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_realvid.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vd_sgi.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_theora.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_vfw.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd_vfwex.c

- vfwex redundancy removed

2002-09-03 21:13:48 +00:00

vd_xanim.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vd_xvid4.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vd_zrmjpeg.c

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

vd.c

vd.c: Make extern decoder declarations const

2008-04-26 16:53:47 +03:00

vd.h

Make video decoder description structs const

2008-04-25 07:16:32 +03:00

ve_lavc.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

ve_libdv.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

ve_nuv.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

ve_qtvideo.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

ve_raw.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

ve_vfw.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

ve_x264.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

ve_xvid4.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

ve.c

Merge svn changes up to r26555

2008-04-28 12:15:18 +03:00

vf_1bpp.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_2xsai.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_ass.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_blackframe.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_bmovl.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_boxblur.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_crop.c

Move opt_screen_size_[x|y] to options struct

2008-04-25 03:34:27 +03:00

vf_cropdetect.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_decimate.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_delogo.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_denoise3d.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_detc.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_dint.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_divtc.c

vf_divtc.c: Make pointlessly static variable a normal local

2008-04-26 16:38:40 +03:00

vf_down3dright.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_dsize.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_dvbscale.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_eq2.c

Make all vf_info_t structs const

2007-12-02 14:57:15 +00:00

vf_eq.c

Mark some constant symbols as such

2008-04-26 16:35:40 +03:00

vf_expand.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vf_field.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_fil.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_filmdint.c

Move opt_screen_size_[x|y] to options struct

2008-04-25 03:34:27 +03:00

vf_flip.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_format.c

Mark some constant symbols as such

2008-04-26 16:35:40 +03:00

vf_framestep.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vf_fspp.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_geq.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_halfpack.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_harddup.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_hqdn3d.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_hue.c

Mark some constant symbols as such

2008-04-26 16:35:40 +03:00

vf_il.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_ilpack.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_ivtc.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_kerndeint.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_lavc.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vf_lavcdeint.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_mcdeint.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_mirror.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_noformat.c

Mark some constant symbols as such

2008-04-26 16:35:40 +03:00

vf_noise.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_ow.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_palette.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vf_perspective.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_phase.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_pp7.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_pp.c

Mark some constant symbols as such

2008-04-26 16:35:40 +03:00

vf_pullup.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_qp.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_rectangle.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_remove_logo.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_rgb2bgr.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_rgbtest.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_rotate.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_sab.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_scale.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_scale.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

vf_screenshot.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_smartblur.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_softpulldown.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_softskip.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_spp.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_swapuv.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_telecine.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_test.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_tfields.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_tile.c

Merge svn changes up to r26979

2008-06-04 08:10:48 +03:00

vf_tinterlace.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_unsharp.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_uspp.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_vo.c

cosmetics: Remove pointless parentheses from return calls.

2008-05-16 00:23:02 +00:00

vf_yadif.c

Merge svn changes up to r26783

2008-05-15 21:19:35 +03:00

vf_yuvcsp.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_yuy2.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_yvu9.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf_zrmjpeg.c

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

vf.c

Move vf_settings to options struct

2008-04-26 01:19:29 +03:00

vf.h

Move vf_settings to options struct

2008-04-26 01:19:29 +03:00

vfcap.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

vqf.h

Add necessary header #includes to fix 'make checkheaders'.

2008-03-06 08:34:50 +00:00