summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30216Uoti Urpala2010-01-081-3/+4
|\
| * Invoke pci_db2c.awk as an argument to awk instead of letting the shell run it.diego2010-01-041-1/+1
| | | | | | | | | | | | | | | | The shell looks for awk in /usr/bin, the path from the shebang line. However, there exist systems with awk in /bin, namely archlinux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30216 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove previous failed attempt at disabling that auto-generation of some C code.diego2010-01-041-1/+1
| | | | | | | | | | | | | | This reverts the previous buggy commit, r30094. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30214 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Drop -Iloader from CPPFLAGS for the loader subdirectory.diego2010-01-041-1/+1
| | | | | | | | | | | | | | Instead use full relative paths in #includes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30212 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add loader/wine/ to DIRS; its headers should be part of checkheaders.diego2010-01-041-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30211 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30187Uoti Urpala2010-01-081-1/+1
|\|
| * 100l, vo_png must go in SRCS_MPLAYER, not SRCS_COMMON.reimar2010-01-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30187 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change vo_png to use FFmpeg's png encoder instead of libpng.reimar2010-01-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30186 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30185Uoti Urpala2010-01-081-0/+1
|\|
| * Finally add matrixview vo.reimar2010-01-031-0/+1
| | | | | | | | | | | | | | | | Heavily cleaned up/fixed etc. by me, improvements are still possible though. Patch originally by Pigeon <pigeon at pigeond.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30165Uoti Urpala2010-01-081-1/+1
|\|
| * Extract functions to generate yuv->rgb matrices and lookup tables into areimar2009-12-311-1/+1
| | | | | | | | | | | | | | separate file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30104Uoti Urpala2009-12-301-3/+3
|\| | | | | | | Ignore the broken correct-pts change in r30100.
| * Do not auto-generate the C code to handle PCI vendor and device names.diego2009-12-201-1/+1
| | | | | | | | | | | | | | This part of the code does not change so there is no point in generating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30094 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not autogenerate vidix/pci_names.h.diego2009-12-201-1/+1
| | | | | | | | | | | | | | Its contents is always the same, so there is no point in generating it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30088 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Run vidix/pci_db2c.awk directly instead of passing it to awk.diego2009-12-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30077 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Experimental support for external libass.reimar2009-12-191-3/+4
| | | | | | | | | | | | | | So far probably only works with the libass from Ubuntu 9.10 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30066 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30065Uoti Urpala2009-12-291-0/+1
|\|
| * Add x11_common as dependency for OpenGL with X11 backend.reimar2009-12-191-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30064 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30055Uoti Urpala2009-12-181-1/+4
|\|
| * DShow TV input needs part of the our DirectShow code, so add the properreimar2009-12-091-1/+4
| | | | | | | | | | | | | | dependencies to the Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29985 b3059339-0415-0410-9bf9-f77b7e298cf2
* | build: Generate version numbers for gitUoti Urpala2009-11-231-4/+0
| | | | | | | | | | | | | | | | | | | | Update the version.sh script for git so it'll generate version numbers more useful than "UNKNOWN". At the moment it only generates the short SHA1 name, but adding a tag as a starting point should allow more useful output. Rather than update the Makefile logic that tried to guess whether the svn revision had changed since the last version.h update, just run the version.sh script from configure so the version is updated at least at that time.
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-1/+3
|\|
| * Add preliminary support for streaming via FFmpeg's URProtocol functions.reimar2009-11-171-1/+3
| | | | | | | | | | | | | | Basic playback tested for file and http protocols. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29923 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-14/+6
|\|
| * Remove CONFIG_TV_TELETEXT.cehoyos2009-11-071-1/+1
| | | | | | | | | | | | | | | | DVB teletext support is nearly finished, it will be possible to read teletext from file, it will not be depending on reception any more. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move teletext specific code from stream into libmpcodecs.cehoyos2009-10-291-1/+1
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of COMMON_LDFLAGS variable. It was a pointless indirection.diego2009-10-191-7/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29784 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge rules for building mencoder and mplayer.diego2009-10-181-3/+4
| | | | | | | | | | | | | | Just the dependencies are different, so specify them separately. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29779 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of LDFLAGS_MPLAYER and LDFLAGS_MENCODER variables.diego2009-10-181-8/+2
| | | | | | | | | | | | | | They are only used in one place so the indirection is pointless. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29778 b3059339-0415-0410-9bf9-f77b7e298cf2
* | av_log callback handling overhaulUoti Urpala2009-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move av_log callback handling from vd_ffmpeg.c to a new file av_log.c and install the callback immediately when starting the program. Main functionality improvements of the new code: - The old version only installed the callback when opening an FFmpeg video decoder. If nothing had triggered that then av_log() messages from other sources (libavformat, audio decoding, swscale usage) bypassed MPlayer's output system completely. Now the callback is always installed. - Current av_log message severity levels are handled correctly. The old code used MSGL_ERR for some messages that should be MSGL_V. - Message type is now set for libavformat contexts (MSGT_DEMUXER / MSGT_MUXER). - The old code did "mp_msg_test(type, mp_level)" before actually determining the type, so that it always used MSGT_FIXME. This led to some messages being incorrectly dropped in case the user had specified module-specific verbosity levels. The old check in question was originally motivated by performance problems when there were a lot of callbacks; however it's not clear whether the part about it skipping the type determination was intentional (most of the performance problems must have come from the way the original code used snprintf) and in my tests current FFmpeg libraries have not generated unreasonable amounts of callbacks anyway.
* | Merge svn changes up to r29644Uoti Urpala2009-09-041-2/+2
|\|
| * Reuse the osx_common convert_key function to convert OSX keycodes to MPlayerreimar2009-08-281-1/+1
| | | | | | | | | | | | | | keycodes instead of its own switch-case in vo_corevideo.m git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29575 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add osx_common.c and move the keycode conversion (OSX to MPlayer) there.reimar2009-08-281-1/+1
| | | | | | | | | | | | | | | | Also get rid of our own defines for the keycodes and instead use the predefined ones from Carbon. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29573 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vf_uspp: Mark as depending on avcodec API only, not internalsUoti Urpala2009-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | There has been some confusion about whether this filter depends on libavcodec internals or not. When originally added it included explicit code to support building with a shared library avcodec, but it also used the internal dsputil.h header. Later it was marked as depending on libavcodec internals, then the dsputil.h include was removed as unnecessary. It seems to build fine without any internal headers now and has no obvious other usage of internal symbols either, so I'm enabling the build whenever libavcodec is available.
* | build: Readd support for code depending on FFmpeg internalsUoti Urpala2009-07-261-1/+12
| | | | | | | | | | | | | | | | Add configure option --ffmpeg-source-dir=PATH. If the user specifies this option then building code that depends on FFmpeg internals is enabled and the files files which use internal lavf headers will get them from this path. The FFmpeg libraries linked with must export needed internal symbols.
* | build: Remove code for internal FFmpeg buildUoti Urpala2009-07-261-45/+1
| | | | | | | | | | | | Remove some now unnecessary parts that were used for the internal FFmpeg build, mainly configure tests for FFmpeg features and Makefile logic for building it.
* | Remove internal libass treeUoti Urpala2009-07-261-9/+1
| | | | | | | | | | Remove the libass/ directory and use the newest standalone version of the library instead.
* | Disable functionality requiring libswscale internalsUoti Urpala2009-07-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | The following are affected: vo_yuv4mpeg, vf_halfpack, vf_palette, vf_rgb2bgr, vf_yuy2, vo_mga, vo_xmga. In vo_yuv4mpeg, only disable RGB support (which is probably little used). Others are disabled completely for now. vo_mga and vo_xmga are disabled by preventing configure from enabling them. The rest is placed under LIBSWSCALE_INTERNALS variable which isn't currently enabled anywhere.
* | Merge svn changes up to r29417Uoti Urpala2009-07-121-0/+1
|\|
| * new debanding filterlorenm2009-07-071-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29413 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove the internal GUIAnton Khirnov2009-07-071-59/+1
| | | | | | | | | | | | | | | | | | The GUI is badly designed and too closely coupled to the internal details of other code. The GUI code is in bad shape and unmaintained for years. There is no indication that anyone would maintain it in the future either. Even if someone did volunteer to implement a better integrated GUI having the current code in the tree probably wouldn't help much. So get rid of it.
* | Merge svn changes up to r29412Uoti Urpala2009-07-071-8/+8
|\|
| * Rename LIBVORBIS Makefile variable to VORBIS.diego2009-06-141-2/+2
| | | | | | | | | | | | | | The latter is more clear as it can represent either Tremor or libvorbis. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29365 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: alphabetically sort SRCS_MPLAYERdiego2009-05-211-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29318 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing path to find invocation for tags/TAGS creation.diego2009-05-151-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29310 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify find invocation in tags/TAGS generation command:diego2009-05-151-2/+2
| | | | | | | | | | | | | | | | - Drop '-print', which is the default for find. - Drop unnecessary invocation of find in a subshell. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29309 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29304Uoti Urpala2009-07-071-5/+6
|\|
| * 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
| * 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
* | Merge svn changes up to r29277Uoti Urpala2009-05-081-268/+279
|\|
| * Rename macosx video output driver to corevideo.diego2009-05-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29252 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename macosx audio output driver to coreaudio.diego2009-05-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move non-conditional SRCS lists below the conditional parts. This allowsdiego2009-04-201-222/+223
| | | | | | | | | | | | | | simplifying the addition of the conditional parts to the SRCS lists. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29208 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmeticsdiego2009-04-201-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29207 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use temporary variables to add objects that depend on more than onediego2009-04-201-24/+29
| | | | | | | | | | | | | | condition to conditionally compiled parts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29206 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only add existing files to the FFMPEGFILES variable.diego2009-04-201-1/+1
| | | | | | | | | | | | | | based on a patch by Carl Fürstenberg, azatoth gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29204 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use ADDSUFFIXES function to simplify version.h dependency declaration.diego2009-04-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29203 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Introduce ADDSUFFIXES function and use it to simplify thediego2009-04-201-2/+3
| | | | | | | | | | | | | | ADD_ALL_DIRS and ADD_ALL_EXESUFS functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29202 b3059339-0415-0410-9bf9-f77b7e298cf2
| *