Commit Graph

494 Commits

Author SHA1 Message Date
Uoti Urpala e09fe1ce04 Merge svn changes up to r27458 2008-08-12 15:03:34 +03:00
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
Uoti Urpala cab2e4f5ca Include corresponding .h in some .c files 2008-08-12 13:46:01 +03:00
ben 8903c510f8 Add VIDIX driver for SuperH Mobile VEU hardware block.
Patch by Magnus Damm <magnus dot damm at gmail dot com>.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27452 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 23:10:03 +00:00
ben f2918b9240 Add proper VIDIX support for SuperH architecture.
Patch by Magnus Damm <magnus dot damm at gmail dot com>.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27451 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-11 23:04:03 +00:00
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00
ben f56b633045 Add NV12 colorspace support to VIDIX driver.
patch by Magnus Damm <magnus dot damm at gmail dot com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27430 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:28:28 +00:00
diego 82f319af62 Change a bunch of X11-specific preprocessor directives.
Switch from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-04 06:16:23 +00:00
Uoti Urpala 2d4656e070 Merge svn changes up to r27332 2008-07-21 15:03:49 +03:00
michael 0589f47239 Remove -std=gnu99/gnu89/default dialect linux define, as it violates the
C standard.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27282 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-15 00:21:32 +00:00
Uoti Urpala de560e8167 Merge svn changes up to r27123
Conflicts:

	libmenu/menu_filesel.c
	libmenu/menu_pt.c
2008-06-23 03:58:44 +03:00
ben f3a13413c9 cosmetic: be consistent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27119 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:38:15 +00:00
ben b40e5e88d5 remove useless typedef againstfor VDXContext
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27116 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:28:50 +00:00
ben b6697c56e6 cosmetic: give a coherent indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27115 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:24:53 +00:00
ben 598f6c15b9 remove some useless functions from vidix api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27114 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:21:31 +00:00
ben 3927b78660 remove useless 'else'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27113 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:19:18 +00:00
ben 86d8472fb3 renamed vidixlib.c to vidix.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27112 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:17:38 +00:00
ben 144b0d05cd remove now useless vidixlib.h file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27111 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:16:34 +00:00
ben c29c9e9054 move content of vidixlib.h into vidix.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27109 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:09:54 +00:00
ben 536096e938 cosmetic: give coherent indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27108 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-20 20:07:36 +00:00
Uoti Urpala 68e70b3ec3 Merge svn changes up to r27092
Conflicts:

	libmpdemux/demuxer.c
	libvo/vo_xv.c
	mencoder.c
2008-06-17 05:04:32 +03:00
diego 1c54cec54a Add standard license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27038 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-08 14:57:49 +00:00
diego 319097c5dc Add comments to a few #endif preprocessor directives.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27037 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-08 14:53:18 +00:00
diego 65371f38c9 Remove pointless and commented-out #ifdef.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27028 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-08 10:14:38 +00:00
diego 2515478aa6 Fix dhahelper.h #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27026 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-08 09:19:47 +00:00
Uoti Urpala af3fcdf2de Merge svn changes up to r27025
Conflicts:

	command.c
	libvo/vosub_vidix.c
	libvo/vosub_vidix.h
	mplayer.c
2008-06-07 19:57:57 +03:00
ben 494da54eaf remove C++ inclusion guard from vidix headers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27011 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 11:47:33 +00:00
diego d47186c5d8 Add default definition for SVGA device.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27010 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 11:45:25 +00:00
ben 6212ebbcae remove useless vidix versioning stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27009 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 11:43:57 +00:00
ben b7391dde39 Drop some useless parameter from vidix init routine
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27007 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 10:56:42 +00:00
ben 8e717d77c7 vidix s3 headers was missing proper header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27004 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 10:25:07 +00:00
diego a645f8ecd5 Remove unused variable, fixes the warning:
vidix/sysdep/pci_linux.c:71: warning: unused variable 'config_cmd'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27003 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 09:41:51 +00:00
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
diego 13d53795d9 Merge vidix/dhahelperwin/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26935 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-30 20:09:31 +00:00
diego 5d87f6d9ca Merge vidix/dhahelper/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26934 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-30 19:39:00 +00:00
diego f3617303c1 Rename kernelhelper to dhahelper, that name is more fitting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26933 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-30 19:17:20 +00:00
diego 508a697e94 Fix #include paths.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26932 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-30 19:14:04 +00:00
diego 3acba2c82d cosmetics: Remove useless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26785 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 00:13:03 +00:00
Uoti Urpala a41db36b22 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
2008-05-15 21:19:35 +03:00
diego 1a417a80c3 Use standard license header with standard formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26758 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-13 08:36:44 +00:00
diego 233ac8d319 Use standard license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26751 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-12 17:39:36 +00:00
diego 6ca3474d83 consistency cosmetics: Move some parts of file headers around; typo fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26750 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-12 17:33:35 +00:00
diego 84113624b6 Remove pointless changelogs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26747 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-12 10:44:36 +00:00
diego 57239aeadd Use standard license header and add back credits line for Marcel Naziri.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26746 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-12 09:05:16 +00:00
diego 89755ba8bc Remove pointless changelog from file header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26745 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-12 08:58:25 +00:00
Uoti Urpala 2faffe2a7f Merge svn changes up to r26555 2008-04-28 12:15:18 +03:00
Uoti Urpala 38d50e9369 Add .gitignore files 2008-04-27 04:59:37 +03:00
diego 67d6784626 clean and distclean rules do the same thing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26549 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 16:58:15 +00:00
diego 3f94c61854 Merge vidix/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26548 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 12:47:24 +00:00
diego dc7ffa9855 Merge clean and distclean rules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26547 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-26 11:17:17 +00:00