Uoti Urpala
0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +03:00
Uoti Urpala
6d908205fb
Merge svn changes up to r29304
2009-07-07 02:07:11 +03:00
reynaldo
e572539fcd
Get rid of some more trailing whitespace
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29297 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 03:01:09 +00:00
Uoti Urpala
1db1773ec2
Merge svn changes up to r29277
2009-05-08 23:50:26 +03:00
diego
d9ded9284c
Add missing 'void' to parameterless function declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-04 17:35:26 +00:00
Uoti Urpala
ccf4d9e96c
Merge svn changes up to r28403
2009-01-31 04:52:15 +02:00
diego
9133dff0b2
Fix warnings about undefined preprocessor directives.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28398 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-30 23:22:29 +00:00
Uoti Urpala
0406d95120
Merge svn changes up to r28348
2009-01-23 20:56:50 +02:00
diego
8d242b60e0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28342 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-19 17:12:43 +00:00
Uoti Urpala
79e1aa7cc7
Merge svn changes up to r28341
...
Conflicts:
configure
libmpcodecs/native/rtjpegn.c
2009-01-19 00:04:43 +02:00
reimar
93d598c7b2
Lots and lots of #ifdef ARCH_... -> #if ARCH_...
...
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
2009-01-16 09:21:21 +00:00
Uoti Urpala
9bcd12fdf5
Merge svn changes up to r28310
...
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.
2009-01-15 05:57:31 +02:00
diego
824abb5a65
Add missing 'void' keyword to parameterless function declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 14:48:03 +00:00
Uoti Urpala
8c144171bb
Merge svn changes up to r28087
...
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
2008-12-04 01:55:52 +02:00
diego
0864f92e7a
Get rid of pointless 'extern' keywords.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
Uoti Urpala
e62517ef6a
Merge svn changes up to r28065
2008-12-02 18:02:05 +02:00
diego
39f7129214
Use standard unsigned long type instead of u_long.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28053 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-30 13:37:42 +00:00
Uoti Urpala
0301309425
Merge svn changes up to 27824
...
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
2008-10-25 05:12:34 +03:00
ranma
1ec2a1c33f
pci.c includes dha.h, remove redundant MAX_* defines
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27798 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-18 16:07:47 +00:00
ranma
a6b806a97a
MAX_PCI_DEVICES 64 is not enough on my system (even though lspci only shows 25 devices), upped to 256
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27797 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-18 16:07:18 +00:00
diego
26b29f4f2d
Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.
...
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
2008-10-16 20:17:56 +00:00
diego
6b52a2e974
Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
...
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
2008-10-16 18:59:27 +00:00
diego
4d644f513c
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
...
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
2008-10-13 16:23:55 +00:00
diego
e00c1a9e6d
Remove redundantly declared definitions FILE_ANY_ACCESS and CTL_CODE, fixes:
...
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
2008-10-13 14:47:11 +00:00
diego
79e038985a
Remove unused variables.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27751 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-12 22:12:24 +00:00
Uoti Urpala
ebb4abf208
Merge svn changes up to r27682
...
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
2008-10-02 05:17:23 +03:00
diego
d4ea9155a7
Remove one more pointless and gcc-specific __attribute__ ((unused)).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27658 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-23 20:53:46 +00:00
diego
fdb59804aa
Restore function parameters mistakenly removed in previous commit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27657 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-23 20:53:08 +00:00
diego
02eb69fc5c
Remove pointless and gcc-specific __attribute__ ((unused)).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27656 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-23 20:38:30 +00:00
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