Commit Graph

29570 Commits

Author SHA1 Message Date
Uoti Urpala 6d908205fb Merge svn changes up to r29304 2009-07-07 02:07:11 +03:00
Amar Takhar 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
Amar Takhar 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
Uoti Urpala 7394680e4e Add temporary no-op translation function stubs 2009-07-06 19:56:57 +03:00
Grigori Goronzy 91d0d3a082 Add OSS4 vmix volume control to ao_oss
Support for per-application volume control, introduced by OSS4.
This adds a check in configure to add the proper include path
to the CFLAGS, if needed. The path is taken from /etc/oss.conf.
2009-06-24 20:49:21 +02:00
Uoti Urpala c67b681e4c Disallow subtitles without video
Make sure no subtitle stream can be selected when no video stream
exists. The code doesn't handle subtitles without video properly and
it was possible to trigger crashes in some cases.
2009-06-13 00:14:47 +03:00
Uoti Urpala f48840f820 Fix ordered chapter pruning of redundant timeline parts
Code that was supposed to merge two timeline parts if the second one
started exactly where the first one stopped didn't work because it
mixed timestamps in different units (I had changed the units of some
variables after originally writing that code but forgotten to update
it). As a result of the bug there were unnecessary part switches, but
it was unlikely to cause any serious problems.
2009-05-22 18:25:54 +03:00
diego eafe5b7517 Make sure that -Ilibdvdread4 appears in CFLAGS before any system directories
so that internal dvdread headers do not conflict with system headers.
Fixes Bugzilla #1465.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29304 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 19:25:35 +00:00
diego e2a6bb7b41 Make sure that -I flags for internal library copies come before other CFLAGS
so that header files do not conflict with system-installed versions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29303 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 18:09:53 +00:00
diego 58931b2f12 Fix IPv4 vs. IPv6 typo, closes Bugzilla #1439.
noticed by Loic Pefferkorn, loic-mplayer loicp eu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29302 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 15:00:32 +00:00
diego 8ef6c14e0d libdvdread4 does not use HAVE_CONFIG_H, so drop the -D flag for libdvdread4.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29301 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 08:21:53 +00:00
diego cf7bc50739 Add HAVE_PPC64 definition for FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29300 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 07:25:04 +00:00
diego 0d5ab8b6d9 Make sure CONFIG_MUXERS is always set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29299 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 06:52:57 +00:00
reynaldo c9869e7c5b Get rid of some more trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29298 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 03:03:35 +00: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
reynaldo 08525a3e0b Some reformating to avoid two too long lines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29296 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 02:58:29 +00:00
reynaldo 8da20964d5 Get rid of some more trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29295 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 02:45:52 +00:00
reynaldo 0e5e94beba Get rid of some more trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29294 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 02:43:03 +00:00
reynaldo 6d781a3226 Get rid of some more trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29293 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 02:41:04 +00:00
reynaldo 9a420b0f93 Get rid of some more trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29292 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 02:33:28 +00:00
reynaldo 99f935a624 Get rid of some more trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29291 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 02:31:11 +00:00
reynaldo 0924da69c4 Get rid of some more trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29290 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 02:29:29 +00:00
rtogni 0d7de49f1c chunk size = 0 is valid for DATA chunks (used in live streams), don't
print warning message



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29289 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-10 21:13:15 +00:00
diego f46dc0b514 Add const qualifier to param argument of sws_getContext() and
sws_getCachedContext().  Fixes the warning:
swscale.c:3408: warning: assignment discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29288 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-10 14:00:00 +00:00
diego 859c7ee1e3 Move preprocessor condition before variable declaration, fixes the warning:
libswscale/swscale.c:1795: warning: unused variable 'flags'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29287 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-10 11:37:04 +00:00
rik 1939b7e3f3 MPV_common_init balks if s->avctx->pix_fmt == PIX_FMT_NONE, so we set it correctly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29286 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 21:37:07 +00:00
diego b4f1c69f87 Remove redundant information about configuring MPlayer for GUI support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29285 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 18:47:18 +00:00
diego 2ac4d0d1fb Move image formats section to a more appropriate place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29284 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 18:13:48 +00:00
diego 8e66013c90 cosmetics: indentation fixes for the dvdread check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29283 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 13:15:31 +00:00
diego 6dc61f228d Fix misplaced 'fi' in external dvdread test.
patch by Diogo Franco, diogomfranco gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29282 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 12:52:44 +00:00
diego e4c9161560 Add missing const qualifiers to AltiVec function parameters where appropriate.
Fixes a couple of 'discards qualifiers from pointer target type' warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29281 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-09 10:56:37 +00:00
Uoti Urpala 59ffaa41f0 video_out.c: Fix a minor memory leak
The code that loops over possible video output drivers and tries to
find a working one does not free and reallocate the 'struct vo' if a
driver's preinit() call fails, but just overwrites the same struct
instead. This means that any memory the failing driver allocated as a
talloc subcontext will not be freed immediately. This is not even a
real leak as the memory will be freed once the VO is closed, but it's
still nicer to free things immediately. Add talloc_free_children() to
free any such talloc subcontexts that were created during the failing
preinit().
2009-05-09 02:44:08 +03:00
diego f077569dff Add standard license header to all files in libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 21:51:13 +00:00
diego 537d6886d5 Replace informal GPL license header by standard GPL header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29279 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 21:47:50 +00:00
diego e326ffeb9c Replace informal LGPL header by standard LGPL license header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29278 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 21:47:03 +00:00
Uoti Urpala 1db1773ec2 Merge svn changes up to r29277 2009-05-08 23:50:26 +03:00
diego 86c9fb2e89 lirc anc lircc are MPlayer-only, so add LDFLAGS for MPlayer link only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29277 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 16:21:03 +00:00
cehoyos 238df952ef Do not use flag CWBackPixel when calling vo_x11_create_vo_window():
It leads to VDPAU errors after video aspect ratio changes.

Patch by Stephen Warren.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29276 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 15:43:54 +00:00
diego 5bad4ba482 The Apple remote code needs the Cocoa framework to link.
Apple remote LDFLAGS are only necessary for linking MPlayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29275 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 13:58:42 +00:00
diego c12922d678 Add -framework Carbon to LDFLAGS when Mac OS X finder or bundle is enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29274 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 21:34:56 +00:00
adrian 31886434cd Adrian is maintaining vo_corevideo and merging the OSX Extended GUI branch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29273 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 21:02:57 +00:00
vitor 19c12794ad Fix sliced yuv410 -> yuv420 conversion
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29272 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 20:41:04 +00:00
jrash efaa440083 revise previous translation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29271 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 13:16:22 +00:00
jrash 057fc508aa sync with en/mplayer.1 r29252
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29270 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-07 13:13:54 +00:00
diego ddb7269a1e cosmetics: Move Quartz and CoreVideo checks into the vo driver section.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29269 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 23:02:59 +00:00
diego 5bc20d8d3c LDFLAGS for CoreVideo and Quartz should be MPlayer-only.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29268 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 21:03:56 +00:00
diego d0022933fe libdvdcss requires the Carbon framework to link on Mac OS X.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 18:45:59 +00:00
diego bf26ad6611 cosmetics: Move $def_dvdcss to a more sensible place in config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29266 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 18:04:53 +00:00
diego d46d132b1f cosmetics: Move CoreAudio check to audio output section.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29265 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:57:44 +00:00
diego bcb63539f4 Add prototype for mp_a52_framesize().
This fixes an implicit declaration warning when liba52 is disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29264 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-05 17:36:31 +00:00