summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28712Uoti Urpala2009-02-231-0/+1
|\
| * Add statistics audio filter that prints information about the audio stream.diego2009-02-211-0/+1
| | | | | | | | | | | | | | patch by Nicolas George, nicolas.george normalesup org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28696 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-181-0/+1
|\| | | | | | | | | | | | | | | 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.
| * Add support for VDPAU video out, including hardware decoding.reimar2009-02-161-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28610Uoti Urpala2009-02-161-0/+1
|\|
| * Create a fmt-conversion.c file so fmt-conversion.h can be included by ↵reimar2009-02-141-0/+1
| | | | | | | | | | | | | | | | | | multiple files. Also restructure the code so it provides a pixfmt2imgfmt function, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28549Uoti Urpala2009-02-131-34/+25
|\|
| * Ignore errors from all rm commands in clean targets.diego2009-02-121-12/+12
| | | | | | | | | | | | | | This way make will not stop on failure and remove as much as possible. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28540 b3059339-0415-0410-9bf9-f77b7e298cf2
| * On clean/distclean, remove binaries with all types of executable suffixes.diego2009-02-121-17/+17
| | | | | | | | | | | | | | This helps clean a tree completely before and after crosscompiling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28539 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use addprefix and addsuffix functions to generate TOOLS variable.diego2009-02-121-10/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28538 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-3/+4
|\|
| * Add priority support for OS/2 and factorize the Windows priority support.diego2009-02-101-0/+1
| | | | | | | | | | | | | | patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28520 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Conditionally compile aclib.c instead of placing #ifdef around its content.diego2009-02-081-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove stray tab.diego2009-02-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28464 b3059339-0415-0410-9bf9-f77b7e298cf2
| * We use libdvdcss 1.2.10, not 1.2.9.diego2009-02-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28463 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28461Uoti Urpala2009-02-041-4/+4
|\|
| * Remove -c option from install commands. It is ignored by GNU install anddiego2009-02-011-2/+2
| | | | | | | | | | | | | | incompatible with some other install commands. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28423 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly simplify VIDIX_PCI_FILES command.diego2009-01-311-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28410 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-12/+12
|\|
| * HAVE_3DNOW --> HAVE_AMD3DNOWdiego2009-01-261-10/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
| * version.h depends on version.sh.diego2009-01-261-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28369 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28366Uoti Urpala2009-01-261-2/+2
|\| | | | | | | | | | | | | | | | | Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
| * HAVE_3DNOWEX --> HAVE_3DNOWEXTdiego2009-01-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28361 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factorize print_version().diego2009-01-251-1/+1
| | | | | | | | | | | | | | Print CPU information in verbose mode instead of by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28360 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-11/+25
|\| | | | | | | | | | | | | | | 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.
| * Support an "internal" dvdnav version to make it easier to compile with,reimar2009-01-101-0/+14
| | | | | | | | | | | | | | test and debug dvdnav SVN. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28291 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Switch internal dvdread to libdvdread SVN external.reimar2009-01-081-11/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28204Uoti Urpala2008-12-271-1/+1
|\|
| * libavcodec/i386/ was renamed to libavcodec/x86/.diego2008-12-221-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28177 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile: Fix live555 compilationUoti Urpala2008-12-221-1/+1
| | | | | | | | | | | | The change to create .d files with .o incorrectly used CFLAGS instead of CXXFLAGS when compiling .cpp files. This broke the build if live555, which is the only part using C++ code, was enabled.
* | Merge svn changes up to r28162Uoti Urpala2008-12-191-2/+2
|\|
| * another round of armv4l --> arm changesdiego2008-12-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28159 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libavcodec/armv4l/ was renamed to libavcodec/arm/.diego2008-12-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28158 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile: prevent default build rules being used on FFmpeg filesUoti Urpala2008-12-061-1/+5
| | | | | | | | | | | | | | | | | | After adding .o files to the dependencies of FFmpeg .a files make tried to build those .o files with default rules before recursing to the FFmpeg subdirs. Fix this by adding a dummy rule. Also fix incorrectly placed parentheses in the command creating the FFMPEGFILES list. That resulted in some files being listed multiple times, triggering warnings from the dummy rule.
* | Makefile: Rebuild FFmpeg libraries when .asm and .o files changeUoti Urpala2008-12-061-1/+1
| | | | | | | | | | | | | | There was a missing dependency that meant FFmpeg libraries were not recursed if only .asm files changed. Also add a dependency on .o files to update the corresponding .a (though this case should only happen if you run compilation commands manually).
* | Makefile, common.mak: Create .d files when creating corresponding .oUoti Urpala2008-12-061-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The separate .d file creation logic has caused various problems, most notably cases where 'make' exits without doing anybut but without giving any error either. Change the Makefile so that .d files are always created or updated when the corresponding .o file is. This avoids the problems of current .d file generation and still gives correct dependencies. The common.mak change does the same for the libswscale build. However it does not affect the directories under ffmpeg/ because those use ffmpeg/common.mak. The MPlayer common.mak can be copied over the ffmpeg/common.mak file to make the fix apply to the FFmpeg directories too. This is not done automatically because the FFmpeg file is under version control and changing it could cause problems.
* | Makefile: Don't use "install -d" on existing directoriesUoti Urpala2008-12-061-3/+5
| | | | | | | | | | | | | | | | | | Makefile used "install -d" on directories like "/usr/local/bin". Because the install program always tries to set permissions this command causes an installation failure if the directory exists and is writable but you cannot change its permissions (default configuration for group staff on Debian for example). So avoid running such commands on existing directories.
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-5/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Treat video output objects the same as everything else in the build system,diego2008-12-031-6/+44
| | | | | | | | | | | | | | | | i.e. have lines that conditionally enable each in the Makefile and corresponding variables set from configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28080 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename ZORAN Makefile variable to ZR for consistency.diego2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28077 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Treat audio output objects the same as everything else in the build system,diego2008-12-031-2/+19
| | | | | | | | | | | | | | | | i.e. have lines that conditionally enable each in the Makefile and corresponding variables set from configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28075 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compileUoti Urpala2008-12-021-1/+1
| | | | | | | | | | | | | | | | codec-cfg runs on the host system but EXTRA_INC can have target system paths. The EXTRA_INC was added there for shared libavutil support. Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h (which in turn needed libavutil) instead of including the header, and drop the EXTRA_INC flags.
* | Merge svn changes up to r28065Uoti Urpala2008-12-021-0/+1
|\|
| * MNG demuxer by Stefan Schuermans, stefan blinkenarea orgdiego2008-11-301-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28052 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-2/+2
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * Add yasm support to the build system.bircoph2008-11-161-2/+2
| | | | | | | | | | | | | | | | This allows to use yasm assembler optimizations from FFmpeg code, in particular, from libavcodec/fft.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27940 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-251-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Create LIBDIR for binary codecs upon make install.diego2008-10-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27793 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27682Uoti Urpala2008-10-021-2/+1
|\| | | | | | | | | | | | | | | | | Addition of the "outdir" suboption to vo_png in svn was reverted before merging. Conflicts: command.c mplayer.c
| * 10l: Remove deleted file libmpeg2/motion_comp_iwmmxt.c from Makefile as well.diego2008-10-011-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27678 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27649Uoti Urpala2008-09-201-4/+4
|\| | | | | | | | | | | | | Conflicts: Makefile configure libvo/x11_common.c
| * Add shared libswscale support.rathann2008-09-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27632 b3059339-0415-0410-9bf9-f77b7e298cf2
| * External liba52 support, part 2 of 2.rathann2008-09-151-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27620 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use standard -I flags to compile codec-cfg.diego2008-09-151-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27618 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27514Uoti Urpala2008-09-031-16/+13
|\|
| * Rename internal libdvdread fork from dvdread to libdvdreadrathann2008-08-301-11/+11
| | | | | | | | | | | | | | | | to avoid clashing with external libdvdread. (Sync with libdvdread r1122) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove SKIP_DEPS trick. The same effect can be achieved without it.diego2008-08-181-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * FFmpeg no longer has fastmemcpy support, so no longer trigger recursingdiego2008-08-141-1/+1
| | | | | | | | | | | | | | into the FFmpeg directories if libvo/fastmemcpy.h changed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27465 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27458Uoti Urpala2008-08-121-0/+7
|\|
| * Add VIDIX driver for SuperH Mobile VEU hardware block.ben2008-08-111-0/+1
| | | | | | | | | | | | | | | | 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
| *