summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn r29305 (trailing whitespace removal)Uoti Urpala2009-07-070-0/+0
|\ | | | | | | | | | | This merge doesn't actually modify the tree, it's only here to tell git that later merges should not try to apply the whitespace changes (which would produce lots of conflicts).
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-13726-23216/+23216
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-07750-23348/+23138
| |
* | Merge svn changes up to r29304Uoti Urpala2009-07-0781-351/+1385
|\|
| * Make sure that -Ilibdvdread4 appears in CFLAGS before any system directoriesdiego2009-05-121-1/+1
| | | | | | | | | | | | | | | | 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
| * Make sure that -I flags for internal library copies come before other CFLAGSdiego2009-05-121-5/+6
| | | | | | | | | | | | | | 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
| * Fix IPv4 vs. IPv6 typo, closes Bugzilla #1439.diego2009-05-121-1/+1
| | | | | | | | | | | | | | noticed by Loic Pefferkorn, loic-mplayer loicp eu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29302 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libdvdread4 does not use HAVE_CONFIG_H, so drop the -D flag for libdvdread4.diego2009-05-121-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29301 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add HAVE_PPC64 definition for FFmpeg.diego2009-05-121-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29300 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure CONFIG_MUXERS is always set.diego2009-05-121-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29299 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of some more trailing whitespacereynaldo2009-05-121-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29298 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of some more trailing whitespacereynaldo2009-05-121-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29297 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some reformating to avoid two too long linesreynaldo2009-05-121-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29296 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of some more trailing whitespacereynaldo2009-05-121-21/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29295 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of some more trailing whitespacereynaldo2009-05-121-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29294 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of some more trailing whitespacereynaldo2009-05-121-76/+76
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29293 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of some more trailing whitespacereynaldo2009-05-121-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29292 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of some more trailing whitespacereynaldo2009-05-121-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29291 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of some more trailing whitespacereynaldo2009-05-121-14/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29290 b3059339-0415-0410-9bf9-f77b7e298cf2
| * chunk size = 0 is valid for DATA chunks (used in live streams), don't rtogni2009-05-101-1/+1
| | | | | | | | | | | | | | | | print warning message git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29289 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add const qualifier to param argument of sws_getContext() anddiego2009-05-102-4/+5
| | | | | | | | | | | | | | | | 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
| * Move preprocessor condition before variable declaration, fixes the warning:diego2009-05-101-1/+1
| | | | | | | | | | | | | | libswscale/swscale.c:1795: warning: unused variable 'flags' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29287 b3059339-0415-0410-9bf9-f77b7e298cf2
| * MPV_common_init balks if s->avctx->pix_fmt == PIX_FMT_NONE, so we set it ↵rik2009-05-091-0/+2
| | | | | | | | | | | | correctly git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29286 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove redundant information about configuring MPlayer for GUI support.diego2009-05-091-42/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29285 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move image formats section to a more appropriate place.diego2009-05-091-12/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29284 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: indentation fixes for the dvdread checkdiego2009-05-091-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29283 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix misplaced 'fi' in external dvdread test.diego2009-05-091-1/+1
| | | | | | | | | | | | | | patch by Diogo Franco, diogomfranco gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29282 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing const qualifiers to AltiVec function parameters where appropriate.diego2009-05-093-7/+11
| | | | | | | | | | | | | | 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
| * Add standard license header to all files in libmpdemux.diego2009-05-0861-119/+1168
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace informal GPL license header by standard GPL header.diego2009-05-081-11/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29279 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace informal LGPL header by standard LGPL license header.diego2009-05-081-6/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29278 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-07151-1515/+1770
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-07151-1517/+1517
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Add temporary no-op translation function stubsUoti Urpala2009-07-063-0/+12
| |
* | Add OSS4 vmix volume control to ao_ossGrigori Goronzy2009-06-242-0/+38
| | | | | | | | | | | | 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.
* | Disallow subtitles without videoUoti Urpala2009-06-131-2/+2
| | | | | | | | | | | | 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.
* | Fix ordered chapter pruning of redundant timeline partsUoti Urpala2009-05-221-5/+8
| | | | | | | | | | | | | | | | | | 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.
* | video_out.c: Fix a minor memory leakUoti Urpala2009-05-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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().
* | Merge svn changes up to r29277Uoti Urpala2009-05-08106-1363/+1594
|\|
| * lirc anc lircc are MPlayer-only, so add LDFLAGS for MPlayer link only.diego2009-05-081-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29277 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use flag CWBackPixel when calling vo_x11_create_vo_window():cehoyos2009-05-081-1/+3
| | | | | | | | | | | | | | | | | | 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
| * The Apple remote code needs the Cocoa framework to link.diego2009-05-081-1/+1
| | | | | | | | | | | | | | Apple remote LDFLAGS are only necessary for linking MPlayer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29275 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add -framework Carbon to LDFLAGS when Mac OS X finder or bundle is enabled.diego2009-05-071-2/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29274 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Adrian is maintaining vo_corevideo and merging the OSX Extended GUI branch.adrian2009-05-071-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29273 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix sliced yuv410 -> yuv420 conversionvitor2009-05-071-4/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29272 b3059339-0415-0410-9bf9-f77b7e298cf2
| * revise previous translationjrash2009-05-071-63/+63
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29271 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync with en/mplayer.1 r29252jrash2009-05-071-8/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29270 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Move Quartz and CoreVideo checks into the vo driver section.diego2009-05-051-47/+50
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29269 b3059339-0415-0410-9bf9-f77b7e298cf2
| * LDFLAGS for CoreVideo and Quartz should be MPlayer-only.diego2009-05-051-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29268 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libdvdcss requires the Carbon framework to link on Mac OS X.diego2009-05-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29267 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Move $def_dvdcss to a more sensible place in config.h.diego2009-05-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29266 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Move CoreAudio check to audio output section.diego2009-05-051-22/+24
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29265 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add prototype for mp_a52_framesize().diego2009-05-051-0/+2
| | | | | | | | | | | | | | 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
| * Add #define for HAVE_DVDCSS_DVDCSS_H (needed by internal libdvdread) to config.hdiego2009-05-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | instead of passing -D on the compiler command line. This is more convenient and already done with most preprocessor definitions needed by external libraries. Previously the definition was passed on the command line because libdvdread was missing the necessary config.h #include, which was now added. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29263 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless #ifdef around spudec.h #include.diego2009-05-051-2/+0
| | | | | | | | | | | | | | Fixes the build with dvdread disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29262 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: indentationdiego2009-05-051-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29261 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow disabling and enabling VCD support through command line parameters.diego2009-05-051-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29260 b3059339-0415-0410-9bf9-f77b7e298cf2
| * CoreAudio LDFLAGS should be MPlayer-only.diego2009-05-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29259 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Improve CoreAudio check: Use all required headers and frameworks.diego2009-05-051-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29258 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify Mac OS X Finder and Mac OS X Bundle file locations checks.diego2009-05-051-14/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29257 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change VOFW for x86 to 5120, it allows larger images to be scaled and wasmichael2009-05-051-1/+6
| | | | | | | | | | | | | | not slower. Other archs are not changed as the larger VOFW was slower on PPC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29256 b3059339-0415-0410-9bf9-f77b7e298cf2
| * CONFIG_QUICKTIME should be set depending on the state of QTX support.diego2009-05-041-3/+2
| | | | | | | | | | | | | | This fixes linking on Mac OS X with vo_quartz disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29255 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing 'void' to parameterless function declarations.diego2009-05-0424-72/+70
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ao_macosx was renamed to ao_coreaudio.diego2009-05-049-9/+9
| |