summaryrefslogtreecommitdiffstats
path: root/loader
Commit message (Collapse)AuthorAgeFilesLines
* Remove trailing whitespace from most filesUoti Urpala2009-07-0742-608/+600
|
* Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-1/+1
| | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-1/+1
| | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* Merge svn changes up to r29277Uoti Urpala2009-05-085-25/+23
|\
| * Add missing 'void' to parameterless function declarations.diego2009-05-045-25/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29134Uoti Urpala2009-04-023-9/+0
|\|
| * Remove unnecessary malloc.h #includes and related #ifdeffery.diego2009-04-023-9/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29117Uoti Urpala2009-04-011-3/+5
|\|
| * enable vp6 codec to read/write .fpf (passlogfile)compn2009-03-251-3/+5
| | | | | | | | | | | | | | fixes 2pass vp6 encoding on linux git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29062 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-186-6/+6
|\| | | | | | | | | | | | | | | 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.
| * cosmetics: Replace unused 'argc/argv' in main declarations by 'void'.diego2009-02-172-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28634 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:diego2009-02-173-3/+3
| | | | | | | | | | | | | | 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
| * Replace double semicolon by single semicolon.diego2009-02-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-1/+0
|\|
| * remove sys/timeb.h includecompn2009-01-291-1/+0
| | | | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r28341Uoti Urpala2009-01-191-2/+2
|\| | | | | | | | | | | Conflicts: configure libmpcodecs/native/rtjpegn.c
| * Reduce QuickTime binary decoder verbosity.diego2009-01-171-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28340 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-152-3/+3
|\| | | | | | | | | | | | | | | 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.
| * #include the appropriate header instead of using local declarations.diego2009-01-051-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28268 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing 'void' keyword to parameterless function declarations.diego2009-01-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28204Uoti Urpala2008-12-271-13/+13
|\|
| * Avoid u_ BSD type names.diego2008-12-271-13/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28197 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28149Uoti Urpala2008-12-141-6/+6
|\|
| * Change some printf calls to 'Debug printf' so as not to pollute stdout.diego2008-12-111-6/+6
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r28103Uoti Urpala2008-12-061-1/+1
|\|
| * Re-add "extern"s incorrectly removed in r28085reimar2008-12-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28088 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-0413-74/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0313-74/+74
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27899Uoti Urpala2008-11-061-6/+7
|\|
| * Missing free in malloc error case in COutputPinCreate.reimar2008-10-311-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27871 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid useless casts of malloc results.reimar2008-10-311-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27870 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-257-30/+26
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Translate a Hungarian comment, thanks to Denes Balatoni.diego2008-10-191-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27806 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.diego2008-10-165-23/+23
| | | | | | | | | | | | | | | | 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-2/+2
| | | | | | | | | | | | | | 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
| * Remove pointless #ifdef around the whole file, it is just a complicated #if 1.diego2008-10-131-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27760 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27514Uoti Urpala2008-09-031-13/+0
|\|
| * Remove duplicate vsscanf fallback implementation, we have another in osdep/.diego2008-08-221-13/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27476 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-3/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Do not provide a prototype for vsscanf when vsscanf is available.diego2008-08-021-3/+1
| | | | | | | | | | | | | | Fixes a redundant redeclaration warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27396 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Start unifying names of internal preprocessor directives.diego2008-07-301-1/+1
| | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r27092Uoti Urpala2008-06-177-9/+9
|\| | | | | | | | | | | | | | | Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
| * Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h candiego2008-06-087-9/+9
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r26979Uoti Urpala2008-06-045-13/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cosmetics: Remove pointless parentheses from return statements.diego2008-05-165-13/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26789 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26587Uoti Urpala2008-04-299-139/+14
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Use consistent #include paths without "../".diego2008-04-284-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26576 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge loader/Makefile into top-level Makefile.diego2008-04-281-49/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26573 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove calls to Restore_LDT_Keeper, exit() is called immediately afterwardsdiego2008-04-282-4/+2
| | | | | | | | | | | | | | 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
| * Add missing ldt_keeper.h #include; this fixes a bunch of implicit declarationdiego2008-04-282-0/+2
| | | | | | | | | | | | | | of function warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26569 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge TEST_OBJS and TEST_LDFLAGS.diego2008-04-281-4/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26568 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add -g to CFLAGS, not to LDFLAGS.diego2008-04-281-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26567 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge test program compilation rules using patterns.diego2008-04-281-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26566 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add CFLAGS to test program compilation commands.diego2008-04-281-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26565 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing ../osdep/mmap_anon.o to TEST_OBJS.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26564 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary linker flags.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26563 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing #include, fixes the warning:diego2008-04-281-0/+1
| | | | | | | | | | | | | | qtx/qtxload.c:50: warning: implicit declaration of function 'mp_msg_init' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26562 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Adjust printf length modifier, fixes the warning:diego2008-04-281-1/+1
| | | | | | | | | | | | | | qtx/list.c:54: warning: format '%d' expects type 'int', but argument 2 has type 'long int' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26561 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Comment out variables only used in commented-out code, fixes the warnings:diego2008-04-281-2/+2
| | | | | | | | | | | | | | | | qtx/qtxload.c:46: warning: unused variable 'i' qtx/qtxload.c:45: warning: unused variable 'esp' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26560 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Link against individual objects, the osdep library is not generated anymore.diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26559 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove obsolete and non-working test program.diego2008-04-283-74/+0
| | | |