summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * cosmetics: Move ADD_ALL_* functions to a more sensible place.diego2009-04-201-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29201 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmeticsdiego2009-04-191-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29197 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename PARTS variable to FFMPEGPARTS.diego2009-04-191-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29196 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Introduce ADD_ALL_DIRS function to factorize clean and distclean target commandsdiego2009-04-191-2/+3
| | | | | | | | | | | | | | to remove certain patterns in all subdirectories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29195 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert another forgotten ADD_ALL_EXESUFS call.diego2009-04-191-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29194 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Extend ADD_ALL_EXESUFS to work with a list of files instead of a single one.diego2009-04-191-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29193 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove duplicate entry from DIRS.diego2009-04-191-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29192 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add files in all library subdirectories to FFMPEGFILES variable, notdiego2009-04-191-1/+1
| | | | | | | | | | | | | | just the ones below libavcodec. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29191 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29154Uoti Urpala2009-04-091-1/+3
|\| | | | | | | | | Synchronizes runtime CPU detection handling in the build system with latest FFmpeg.
| * Specify precise dependencies for generated header file codecs.conf.h.diego2009-04-081-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29153 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reduce compilation time after version.h was updated.cehoyos2009-04-081-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29152 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29150Uoti Urpala2009-04-081-0/+10
|\|
| * Add rules to install gmplayer manual pages.diego2009-04-061-0/+10
| | | | | | | | | | | | | | based on a patch by Reinhard Tartler, siretart tauware de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29150 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge branch 'ordered_chapters'Uoti Urpala2009-04-081-0/+1
|\ \
| * | Initial ordered chapters supportUoti Urpala2009-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic support for Matroska ordered chapters. The switching between segments is implemented as a general edit timeline that could also be used for other purposes. Some things still need improvement. In particular the current code does not try to do any proper mapping between audio/video/subtitle streams of different files and there should be options for better control of how MPlayer searches other files for the required content.
* | | Merge svn changes up to r29134Uoti Urpala2009-04-021-0/+12
|\ \ \ | |/ / |/| / | |/
| * Add libbs2b audio filter itself.bircoph2009-04-021-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29132 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add recently added FFmpeg subdirs to DIRS variable.diego2009-04-021-0/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29125 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not use full CFLAGS to build codec-cfg, they are unnecessary.diego2009-03-231-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29041 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28951Uoti Urpala2009-03-141-19/+5
|\|
| * KVA vo driver for OS/2, patch by KO Myung-Hun, komh chollian netdiego2009-03-141-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28950 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only compile fastmemcpybench on x86.diego2009-03-141-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28945 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix and restructure fastmemcpybench. It is now one binary that runs alldiego2009-03-101-19/+3
| | | | | | | | | | | | | | available memcpy variants and prints benchmark results about them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28929 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove native nuv demuxer, it only needs more code to achieve the same thingreimar2009-03-091-1/+0
| | | | | | | | | | | | | | as the libavformat demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28907 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make fastmemcpybench almost working - only thing missing is a way toreimar2009-03-091-2/+2
| | | | | | | | | | | | | | override HAVE_MMX etc. from config.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28906 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix fastmemcpybench tools build:diego2009-03-091-11/+15
| | | | | | | | | | | | | | | | - HAVE_MMX and friends now have 0/1 values and are always defined. - Use proper file dependencies instead of a phony target. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28899 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add test for C memcpy()michael2009-03-081-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28894 b3059339-0415-0410-9bf9-f77b7e298cf2
| * rtjpegn.c is only needed by the NuppelVideo encoder, change Makefile accordinglyreimar2009-03-081-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28889 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove internal NuppelVideo decoder, the code in libavcodec can decodereimar2009-03-081-2/+0
| | | | | | | | | | | | | | those files and some more and is far more maintainable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28888 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28862Uoti Urpala2009-03-071-20/+20
|\|
| * Only add -Ilibdvdnav to the CFLAGS of the files that require it.diego2009-03-051-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify CFLAGS generation for individual targets.diego2009-03-051-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28827 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify some vidix dhahelper build commands with automatic make variables.diego2009-03-051-5/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28815 b3059339-0415-0410-9bf9-f77b7e298cf2
| * DART audio output driver for OS/2 by KO Myung-Hun, komh chollian netdiego2009-03-011-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix 10l typo in ADD_ALL_EXESUFS function name.diego2009-03-011-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28772 b3059339-0415-0410-9bf9-f77b7e298cf2
| * codec-cfg does not depend on codecs.conf.h, it is used to generate it.diego2009-03-011-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28771 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make all object files depend on generated header files.diego2009-03-011-4/+2
| | | | | | | | | | | | | | | | This solution does not record precise dependencies but is robust against header dependency changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28770 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add explicit dependencies on generated header files for the object files alongdiego2009-03-011-1/+2
| | | | | | | | | | | | | | | | with the dependency information files. This fixes a straight build without generating dependency information. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28769 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix dependencies on generated header files for the codec* binaries.diego2009-03-011-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28768 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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.diego