summaryrefslogtreecommitdiffstats
path: root/vidix
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28403Uoti Urpala2009-01-311-6/+6
|\
| * Fix warnings about undefined preprocessor directives.diego2009-01-301-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28398 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28348Uoti Urpala2009-01-235-7/+7
|\|
| * cosmetics: Remove pointless period after copyright statement non-sentences.diego2009-01-195-7/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28342 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28341Uoti Urpala2009-01-191-2/+2
|\| | | | | | | | | | | Conflicts: configure libmpcodecs/native/rtjpegn.c
| * Lots and lots of #ifdef ARCH_... -> #if ARCH_...reimar2009-01-161-2/+2
| | | | | | | | | | | | | | | | and #ifdef HAVE_MMX etc -> #if HAVE_MMX. There might be still more that need to be fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28325 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-153-5/+6
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Add missing 'void' keyword to parameterless function declarations.diego2009-01-053-5/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-045-23/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-035-23/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28065Uoti Urpala2008-12-021-2/+2
|\|
| * Use standard unsigned long type instead of u_long.diego2008-11-301-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28053 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-2511-38/+26
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * pci.c includes dha.h, remove redundant MAX_* definesranma2008-10-181-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27798 b3059339-0415-0410-9bf9-f77b7e298cf2
| * MAX_PCI_DEVICES 64 is not enough on my system (even though lspci only shows ↵ranma2008-10-182-2/+2
| | | | | | | | | | | | 25 devices), upped to 256 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27797 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.diego2008-10-165-17/+17
| | | | | | | | | | | | | | | | We were using an inconsistent mix of the three variants and 'volatile' should be the most correct and portable variant. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.diego2008-10-162-8/+3
| | | | | | | | | | | | | | Neither variant is valid C99 syntax, but __asm__ is the most portable variant. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.diego2008-10-132-4/+5
| | | | | | | | | | | | | | This avoids a pointless indirection that only obscures what is really done. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove redundantly declared definitions FILE_ANY_ACCESS and CTL_CODE, fixes:diego2008-10-131-3/+0
| | | | | | | | | | | | | | | | vidix/sysdep/libdha_win32.c:34:1: warning: "FILE_ANY_ACCESS" redefined vidix/sysdep/libdha_win32.c:35:1: warning: "CTL_CODE" redefined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27755 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variables.diego2008-10-121-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27751 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27682Uoti Urpala2008-10-022-4/+4
|\| | | | | | | | | | | | | | | | | Addition of the "outdir" suboption to vo_png in svn was reverted before merging. Conflicts: command.c mplayer.c
| * Remove one more pointless and gcc-specific __attribute__ ((unused)).diego2008-09-231-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27658 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Restore function parameters mistakenly removed in previous commit.diego2008-09-231-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27657 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless and gcc-specific __attribute__ ((unused)).diego2008-09-231-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27656 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27458Uoti Urpala2008-08-126-5/+609
|\|
| * Add VIDIX driver for SuperH Mobile VEU hardware block.ben2008-08-112-0/+598
| | | | | | | | | | | | | | | | 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
| * Add proper VIDIX support for SuperH architecture.ben2008-08-114-5/+11
| | | | | | | | | | | | | | | | 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
* | Make various functions staticUoti Urpala2008-08-121-2/+2
| |
* | Include corresponding .h in some .c filesUoti Urpala2008-08-121-0/+1
| |
* | Merge svn changes up to r27441Uoti Urpala2008-08-082-5/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add NV12 colorspace support to VIDIX driver.ben2008-08-071-0/+1
| | | | | | | | | | | | | | 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
| * Change a bunch of X11-specific preprocessor directives.diego2008-08-041-5/+5
| | | | | | | | | | | | | | Switch from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27332Uoti Urpala2008-07-214-4/+4
|\|
| * Remove -std=gnu99/gnu89/default dialect linux define, as it violates themichael2008-07-154-4/+4
| | | | | | | | | | | | | | C standard. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27282 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27123Uoti Urpala2008-06-2316-180/+102
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * cosmetic: be consistentben2008-06-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27119 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove useless typedef againstfor VDXContextben2008-06-202-32/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27116 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetic: give a coherent indentationben2008-06-201-13/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27115 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove some useless functions from vidix apiben2008-06-202-27/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27114 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove useless 'else'ben2008-06-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27113 b3059339-0415-0410-9bf9-f77b7e298cf2
| * renamed vidixlib.c to vidix.cben2008-06-201-0/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27112 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove now useless vidixlib.h fileben2008-06-2015-55/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27111 b3059339-0415-0410-9bf9-f77b7e298cf2
| * move content of vidixlib.h into vidix.hben2008-06-202-92/+96
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27109 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetic: give coherent indentationben2008-06-201-45/+44
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27108 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27092Uoti Urpala2008-06-178-25/+71
|\| | | | | | | | | | | | | | | Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
| * Add standard license headers.diego2008-06-083-11/+63
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27038 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add comments to a few #endif preprocessor directives.diego2008-06-082-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27037 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless and commented-out #ifdef.diego2008-06-081-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27028 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix dhahelper.h #include paths.diego2008-06-083-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27026 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27025Uoti Urpala2008-06-079-44/+28
|\| | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
| * remove C++ inclusion guard from vidix headersben2008-06-074-30/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27011 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add default definition for SVGA device.diego2008-06-071-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27010 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove useless vidix versioning stuffben2008-06-075-13/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27009 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop some useless parameter from vidix init routineben2008-06-072-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27007 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vidix s3 headers was missing proper headerben2008-06-071-0/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27004 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused variable, fixes the warning:diego2008-06-071-1/+0
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r26979Uoti Urpala2008-06-0433-202/+142
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge vidix/dhahelperwin/Makefile into top-level Makefile.diego2008-05-301-39/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26935 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge vidix/dhahelper/Makefile into top-level Makefile.diego2008-05-301-21/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26934 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename kernelhelper to dhahelper, that name is more fitting.diego2008-05-306-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26933 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix #include paths.diego2008-05-303-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26932 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove useless parentheses from return statements.diego2008-05-1627-138/+138