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

..

freesdp

…

librtsp

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

2008-05-03 17:44:27 +00:00

realrtsp

Use consistent #include paths without "../".

2008-04-28 14:50:24 +00:00

ai_alsa1x.c

…

ai_alsa.c

…

ai_oss.c

…

asf_mmst_streaming.c

Merge svn changes up to r26979

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

asf_streaming.c

Move audio_id and video_id to options struct

2008-04-23 13:48:38 +03:00

audio_in.c

…

audio_in.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

cache2.c

Merge svn changes up to r26979

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

cache2.h

Add basic support for stream controls with cache enabled.

2008-05-24 07:48:35 +00:00

cdd.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

cdinfo.c

…

cookies.c

…

cookies.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

dvb_tune.c

in preparation for multi-frontend patch replaced file-static device names with sprintf() calls in 2 functions

2008-04-13 10:23:54 +00:00

dvbin.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

frequencies.c

Add forgotten const for pal_ireland.

2008-01-13 11:42:33 +00:00

frequencies.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

http.c

Fill stream->end_pos if possible, fixing lavf demuxers that need to seek.

2008-02-19 18:04:10 +00:00

http.h

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

2008-03-10 19:28:42 +00:00

netstream.h

mingw uses windows sockets.

2008-03-11 18:36:10 +00:00

network.c

…

network.h

Move audio_id and video_id to options struct

2008-04-23 13:48:38 +03:00

open.c

Add option pointer to stream struct (at least temporarily)

2008-04-23 13:48:38 +03:00

pnm.c

Use AV_WB*

2008-01-13 13:25:07 +00:00

pnm.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

pvr.h

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

rtp.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

rtp.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

stream_cdda.c

stream_opts should be const

2008-01-13 12:34:42 +00:00

stream_cddb.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

stream_cue.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

stream_dvb.c

removed useless parameter :type from -dvbin (the frontend type is reported by the card)

2008-04-12 20:36:57 +00:00

stream_dvd_common.c

Fix compilation with internal dvdnav

2008-05-31 13:42:09 +00:00

stream_dvd_common.h

adapted to the dvdread->libdvdread transition in dvdnav's repository

2008-05-31 12:52:55 +00:00

stream_dvd.c

Add basic support for stream controls with cache enabled.

2008-05-24 07:48:35 +00:00

stream_dvd.h

adapted to the dvdread->libdvdread transition in dvdnav's repository

2008-05-31 12:52:55 +00:00

stream_dvdnav.c

-chapter is now handled uniformly calling demuxer_seek_chapter() instead

2008-02-11 22:03:34 +00:00

stream_dvdnav.h

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

2008-03-10 19:28:42 +00:00

stream_file.c

Avoid a pointless special-case for opening a file

2008-02-24 11:21:27 +00:00

stream_ftp.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

stream_livedotcom.c

…

stream_mf.c

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

stream_nemesi.c

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

stream_netstream.c

Merge svn changes up to r26783

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

stream_null.c

…

stream_pvr.c

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

stream_radio.c

Merge svn changes up to r26783

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

stream_radio.h

Remove _s/_st suffix from some struct names

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

stream_rtp.c

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

stream_rtsp.c

Merge svn changes up to r26783

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

stream_smb.c

stream_opts should be const

2008-01-13 12:34:42 +00:00

stream_tv.c

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

stream_udp.c

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

stream_vcd.c

stream_opts should be const

2008-01-13 12:34:42 +00:00

stream_vstream.c

Merge svn changes up to r26783

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

stream.c

Merge svn changes up to r26979

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

stream.h

Create a context for input.c state

2008-04-30 13:24:54 +03:00

tcp.c

Add missing stream.h #include, fixes the warning:

2008-05-15 16:11:50 +00:00

tcp.h

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

tv.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

tv.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

tvi_bsdbt848.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

tvi_def.h

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

tvi_dshow.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

tvi_dshow.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

tvi_dummy.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

tvi_v4l2.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

tvi_v4l.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 08:43:15 +00:00

tvi_vbi.c

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

udp.c

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

udp.h

Use standard license headers with standard formatting.

2008-05-14 17:20:42 +00:00

url.c

Clear tmp between ip6 check and string escape to prevent reuse of the

2008-01-20 20:43:46 +00:00

url.h

Add MPLAYER_ prefix to multiple inclusion guards.

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

vcd_read_darwin.h

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

2008-03-10 20:19:15 +00:00

vcd_read_fbsd.h

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

2008-03-10 19:28:42 +00:00

vcd_read_win32.h

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

2008-03-10 19:28:42 +00:00

vcd_read.h

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

2008-03-10 19:28:42 +00:00