0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +03:00
e306174952
Translation system changes part 2: replace macros by strings
...
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
b5972d6f14
Translation system changes part 1: wrap translated strings
...
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
1db1773ec2
Merge svn changes up to r29277
2009-05-08 23:50:26 +03:00
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
d136cf6882
Merge svn changes up to r29134
2009-04-02 23:55:13 +03:00
2e903f7c75
Remove unnecessary malloc.h #includes and related #ifdeffery.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 09:20:48 +00:00
cf9edda1d3
Merge svn changes up to r29117
2009-04-01 02:43:47 +03:00
2a1c8c471e
enable vp6 codec to read/write .fpf (passlogfile)
...
fixes 2pass vp6 encoding on linux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29062 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-25 23:59:48 +00:00
186e5a998c
Merge svn changes up to r28641
...
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
ec3cc468ca
cosmetics: Replace unused 'argc/argv' in main declarations by 'void'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28634 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 12:00:43 +00:00
be8c67909b
Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
...
mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:16:19 +00:00
1b915e419e
Replace double semicolon by single semicolon.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +00:00
ccf4d9e96c
Merge svn changes up to r28403
2009-01-31 04:52:15 +02:00
16e790999a
remove sys/timeb.h include
...
fixes compilation on uClibc based i386 system
patch by Markus Heidelberg markus(x.x)heidelberg(x@x)web(x.x)de
ok'd by diego
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28387 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-29 03:36:14 +00:00
79e1aa7cc7
Merge svn changes up to r28341
...
Conflicts:
configure
libmpcodecs/native/rtjpegn.c
2009-01-19 00:04:43 +02:00
cc52547ece
Reduce QuickTime binary decoder verbosity.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28340 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-17 21:33:30 +00:00
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
e117f31d23
#include the appropriate header instead of using local declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28268 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 14:53:45 +00:00
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
c1b80dcbbb
Merge svn changes up to r28204
2008-12-27 17:40:57 +02:00
47044eb841
Avoid u_ BSD type names.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-27 12:03:51 +00:00
a3ab9e8e46
Merge svn changes up to r28149
2008-12-14 17:28:16 +02:00
8af5e8b497
Change some printf calls to 'Debug printf' so as not to pollute stdout.
...
based on a patch by Zhou Zongyi, zhouzongyi pset.suntec net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28128 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-11 21:29:01 +00:00
cb3dc68691
Merge svn changes up to r28103
2008-12-06 02:16:51 +02:00
45904b63ef
Re-add "extern"s incorrectly removed in r28085
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28088 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-04 15:07:15 +00:00
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
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
e46ce9c0ac
Merge svn changes up to r27899
2008-11-06 20:41:40 +02:00
5fefd9f70a
Missing free in malloc error case in COutputPinCreate.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27871 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-31 13:13:52 +00:00
fa504971c5
Avoid useless casts of malloc results.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27870 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-31 13:12:54 +00:00
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
33c347f66e
Translate a Hungarian comment, thanks to Denes Balatoni.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27806 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 20:02:21 +00:00
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
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
8322f0aef1
Remove pointless #ifdef around the whole file, it is just a complicated #if 1.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27760 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 16:06:15 +00:00
b56858342f
Merge svn changes up to r27514
2008-09-03 10:16:30 +03:00
984d028cd2
Remove duplicate vsscanf fallback implementation, we have another in osdep/.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27476 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-22 20:53:44 +00:00
6cce822505
Merge svn changes up to r27399
...
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
2008-08-02 22:04:35 +03:00
7d6022deba
Do not provide a prototype for vsscanf when vsscanf is available.
...
Fixes a redundant redeclaration warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27396 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 17:09:13 +00:00
04f3909a72
Merge svn changes up to r27374
...
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
2008-07-30 16:39:24 +03:00
4b141479da
Start unifying names of internal preprocessor directives.
...
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 12:01:30 +00:00
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
4b34771463
Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can
...
conflict with the header by the same name in loader/wine/driver.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27031 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-08 10:43:30 +00:00
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
bc0058c63e
cosmetics: Remove pointless parentheses from return statements.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26789 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:31:55 +00:00
06a35804f3
Merge svn changes up to r26587
...
Conflicts:
Makefile
configure
osdep/timer-darwin.c
2008-04-29 05:03:57 +03:00
0792780cb7
Use consistent #include paths without "../".
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26576 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:50:24 +00:00
238670ae7c
Merge loader/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26573 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 14:01:58 +00:00
9a885b71aa
Remove calls to Restore_LDT_Keeper, exit() is called immediately afterwards
...
anyway. The calls were missing parameters and caused compilation failures.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26570 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-28 13:07:01 +00:00
Uoti Urpala
Amar Takhar
diego
compn
reimar
Uoti Urpala