summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* mp3lib: drop internal mp3lib treeUoti Urpala2011-04-021-21/+1
| | | | | | | | | | | | | Delete mp3lib which has been the default mp3 decoder until now. In addition to being an unnecessary embedded library it now fails to compile correctly with the new gcc-4.6, producing noise. After the deletion the default decoder priority for mp3 will be first libmpg123 (a newer version of the code that mp3lib was based on) if available, then ffmp3float which should be available in all normal compiles. I think that some tweaking may be required as these decoder alternatives get wider testing, but any problems should be solvable and there should be no need for mp3lib.
* demux_ty: disable -subcc functionality (demux_ty_osd)Uoti Urpala2011-03-241-1/+0
| | | | | | | | Disable compilation of demux_ty_osd.c because of its GPL v2-only license. This only affects TiVo files with -subcc. After this no v2-only code should get compiled (yuv4mpeg_intern.h has a v2-only license, but the contents of the header look like they're not copyrightable).
* build: change version number generationUoti Urpala2011-02-191-3/+6
| | | | | | | Force Makefile to always run version.sh to potentially regenerate version.h. Drop compiler version and 'git-' prefix from version number. Match only git tags starting 'v'+number when generating version number; leave the 'v' out from the result.
* tremor: drop internal tremor libraryUoti Urpala2011-02-011-18/+0
| | | | | | | Drop internal copy of the tremor library. Note that the internal ogg demuxer (which is still sometimes useful to work around libavformat ogg demuxer problems, though it's itself quite buggy) now cannot be compiled without either external libvorbis or libvorbisidec (tremor).
* libmpeg2: drop libmpeg2 supportUoti Urpala2011-02-011-21/+0
| | | | | libavcodec mpeg2 decoder has been the default for a while and seems to work fine.
* vo_zr2: drop Zoran supportUoti Urpala2011-01-311-3/+0
| | | | | | | There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
* vo_dxr2, ao_dxr2: drop dxr2 supportUoti Urpala2011-01-311-1/+0
| | | | | | dxr2 support had been broken quite a while and nobody noticed. There were finally commits to fix it in the svn repo, but rather than apply those I'll just drop dxr2 support.
* vidix: drop VIDIX supportUoti Urpala2011-01-311-79/+4
| | | | | | | | | | | | | By now VIDIX is too obscure to justify the amount of code and complexity it requires in the sources. Although there is no pressing need to drop it just now from a code point of view, I'll rather remove it before release than release with VIDIX support and then drop it later. Some of the manpage mentions of VIDIX were in "this option supported for these VOs" lists that looked outdated and failed to mention vdpau for example. Replace such incorrect lists with a generic "not supported for all VOs" mention.
* libfaad2:/ Remove forked internal libfaad2 copydiego2011-01-311-41/+0
| | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32741 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove AAC/FAAD2 installation instructions. There is nothing special about building and installing FAAD2, so there is no longer a need to keep maintaining instructions for it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32742 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge branch 'sub'Uoti Urpala2011-01-261-14/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sub: sub/OSD: move some related files to sub/ subtitles: options: enable -ass by default subtitles: change default libass rendering style demux_mkv, chapters: change millisecond arithmetic to ns cleanup: rename ass_* functions to mp_ass_* subs: use correct font aspect ratio for libass + converted subs cleanup: some random minor code simplification and cleanup vf_vo: fix EOSD change detection bug sd_ass: remove subreader use, support plaintext markup subtitles: style support for common SubRip tags and MicroDVD core: ordered chapters: fix bad subtitle parameter subs/demux: don't try to enable sub track when creating it subtitles/demux: store duration instead of endpts in demux packets subtitles: add framework for subtitle decoders options: add special -leak-report option subtitles: remove code trying to handle text subs with libavcodec cleanup: move MP_NOPTS_VALUE definition to mpcommon.h subtitles: move global ass_track to struct osd_state core: move most mpcommon.c contents to mplayer.c core: move global "subdata" and "vo_sub_last" to mpctx subtitles: remove sub_last_pts hack options: move -noconfig to option struct, simplify
| * sub/OSD: move some related files to sub/Uoti Urpala2011-01-261-14/+14
| |
| * subtitles: style support for common SubRip tags and MicroDVDUoti Urpala2011-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | SubRip subtitles have no "official" spec for any styling support, but various tags are in common use; previous code filtered out text between <> to remove HTML-style tags. Add support for those tags and for MicroDVD subtitle styling. The style display is implemented by converting the subtitles to the ASS subtitle format and displaying them with libass, so libass needs to be enabled. Original patch by Clément Bœsch <ubitux@gmail.com>.
| * subtitles: add framework for subtitle decodersUoti Urpala2011-01-181-0/+3
| | | | | | | | | | | | | | | | | | | | Add a framework for subtitle decoder modules that work more like audio/video decoders do, and change libass rendering of demuxed subtitles to use the new framework. The old subtitle code is messy, with details specific to handling particular subtitle types spread over high-level code. This should make it easier to clean things up and fix some bugs/limitations.
* | configure: remove MEncoder-related options and testsClément Bœsch2011-01-251-2/+2
|/ | | | | Also remove one MEncoder variable reference from TOOLS/vivodump rule in Makefile.
* vd_ffmpeg: set thread count to number of cores on machine by defaultUoti Urpala2010-12-201-0/+1
| | | | | | | | | | | Make "-lavdopts threads=0" mean an autodetected number of threads, and make that the default value of the option. Also increase the upper limit of the option from 8 to 16. Add new file osdep/numcores.c which tries to determine the number of cores available on the machine. numcores.c is based (heavily modified) on public domain numcpus.c by Philip Willoughby <pgw99@doc.ic.ac.uk>, downloaded from http://csgsoft.doc.ic.ac.uk/numcpus/
* build: enable vf_geq if libavutil version installs eval.hUoti Urpala2010-11-061-0/+3
| | | | | New enough libavutil versions allow building vf_geq.c without requiring internal FFmpeg headers.
* Makefile: enable .DELETE_ON_ERROR special targetUoti Urpala2010-11-041-0/+6
| | | | | | | | | msgfmt creates the output file even if there was a fatal error. Thus make would stop because of the error return, but the output file would be left on disk and running make again would continue building other files. Enable the .DELETE_ON_ERROR special target to automatically delete target files changed by failing commands. This affects all rules; I think it is the correct behavior for all existing rules.
* Makefile: remove generated locale files in clean targetUoti Urpala2010-11-041-0/+2
|
* vf_stereo3d: Add stereo3d filterreimar2010-11-021-0/+1
| | | | | | | | | Further review very welcome, but it is time (and good enough) to add this. Patch by Gordon Schmidt [gordon.schmidt s2000.tu-chemnitz de] with changes by Endre Kollár [taxy443 gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32527 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Move the read_pnm function into a separate filecigaes2010-11-021-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32513 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: don't list dependencies for codec-cfg.ddiego2010-11-021-1/+1
| | | | | | The file is now generated as a side effect of compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32355 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Remove __USE_UNIX98 from libdvd* CFLAGSdiego2010-11-021-3/+3
| | | | | | | This is an internal glibc symbol that should not be used directly. Besides, other CFLAGS already take care of enabling single Unix v2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32348 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Do not compile libfaad2 with -D_GNU_SOURCEdiego2010-11-021-1/+1
| | | | | | It is not necessary and libfaad2 itself does not do it either. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32344 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Drop separate compilation rules for dhahelperwin filesdiego2010-11-021-6/+0
| | | | | | The generic rules should work just as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32333 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Merge dhahelperwinclean and dhahelperclean targetsdiego2010-11-021-5/+3
| | | | | | | There is no need to have them separate; in other clean rules we make an effort to clean up all platforms at the same time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32331 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Remove remnants of explicit dependency file generationdiego2010-11-021-3/+2
| | | | | | | Dependency files are now generated as a side effect of compilation, and have no independent creation rules. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32327 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Fix osdep/mplayer.rc.o vs. osdep/mplayer-rc.o typodiego2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32326 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: read dependency files for assembler files toodiego2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32321 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Rename DEPS variable to DEP_FILESdiego2010-11-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32320 b3059339-0415-0410-9bf9-f77b7e298cf2
* build: update DirectFB requirements, reduce #ifdefsdiego2010-11-021-2/+1
| | | | | | | | | | | | | | | | | | Require DirectFB version 0.9.15 instead of 0.9.13. This simplifies the build system at the cost of requiring a library version that was released at the end rather than the middle of 2002. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32251 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify DirectFB check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32252 b3059339-0415-0410-9bf9-f77b7e298cf2 Require DirectFB version 0.9.22. This allows getting rid of a lot of library version check #ifdeffery. Release 0.9.22 is from February 2005, so the requirement is reasonable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32253 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: remove obsolete DIRS list entriesUoti Urpala2010-11-021-7/+0
|
* build: enable/disable all FFmpeg libraries togetherUoti Urpala2010-11-021-17/+16
| | | | | | | | | Enable all of libavcodec, libavformat, libswscale, and libpostproc together (libavutil is always required). based on svn commit by diego: git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove MEncoderUoti Urpala2010-11-021-52/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable MEncoder compilation and remove files used by MEncoder only. There's no attempt to remove all references to MEncoder from the build system, documentation etc at this point. Removed files: (muxers, audio/video encoders, misc) mencoder.c cfg-mencoder.h parser-mecmd.[ch] xvid_vbr.[ch] libmpdemux/muxer* libmpcodecs/ae* libmpcodecs/ve* libmpcodecs/native/rtjpegn.[ch] libmpcodecs/native/mmx.h // was used by rtjpegn only Rationale: MEncoder is still useful for some people, but there's not much potential for further development; in the long run almost all use cases can be handled better by solutions based on something else (for example using FFmpeg or encoding MPlayer output). FFmpeg is already getting video filtering support which should work for some common MEncoder uses. Keeping MEncoder working takes extra work that is away from player development. While that amount of work is not huge (mostly MEncoder can be just ignored), it's not completely insignificant either. MEncoder is still maintained to some degree in the svn tree, so if necessary it's possible to use it from there for now. This tree has never had major improvements for the MEncoder side, so using svn MEncoder instead should be no major loss.
* enable vo_mga, vo_xmga, vf_palette, vf_halfpackUoti Urpala2010-11-021-7/+2
| | | | | | Nothing should depend on libswscale internals any more, so re-enable everything. vf_palette and vf_halfpack were actually fixed earlier but were not properly enabled.
* Makefile: remote obsolete dep/depend targets, mark "locales" phonyUoti Urpala2010-11-021-4/+2
|
* Makefile: Move header compilation rules to the bottom of the rules listdiego2010-11-021-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32042 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: remove distclean hack for dependency filesdiego2010-11-021-3/+0
| | | | | | | | Remove hack that skips including dependency files on distclean. Now that dependency files are generated as a sideeffect of compilation this workaround is no longer needed since distclean no longer tries to create them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31969 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: Rename "network" variable and option to "networking"diego2010-11-021-1/+1
| | | | | | This avoids conflicts with the FFmpeg variable of the same name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31749 b3059339-0415-0410-9bf9-f77b7e298cf2
* subs: Add support for PGS subtitle decoding via libavcodecreimar2010-11-021-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31665 b3059339-0415-0410-9bf9-f77b7e298cf2
* libgsm: Remove libgsm wrapperreimar2010-11-021-2/+0
| | | | | | | | | | Remove copy of old and ugly libgsm code and wrapper. Decoding these formats is supported via FFmpeg both natively and through libgsm. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31657 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31664 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_bluray: add unencrypted Blu-ray playbackben2010-11-021-0/+1
| | | | | | | Support for unencrypted Blu-ray playback through libbluray. Use it through: mplayer br:////path/to/disc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31631 b3059339-0415-0410-9bf9-f77b7e298cf2
* Windows support: add a manifest filereimar2010-11-021-0/+2
| | | | | | | Add a manifest file to disable file and registry "virtualization" on Windows. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31630 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: Separate dependency flags from general CFLAGSdiego2010-11-021-4/+4
| | | | | | | | | | Before, there was an unfortunate interaction with 'make checkheaders': Compiling a .h file would generate a .d dependency information file for that .h file as a sideeffect of compilation. Unfortunately this would clobber the .d files of the .c files with the same basename, resulting in broken dependency information when running plain make. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31614 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_mpg123: add MP3 decoding through libmpg123diego2010-11-021-0/+1
| | | | | | patch by Thomas Orgis, thomas-forum orgis org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31590 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factorize MPlayer/MEncoder version string handling.diego2010-11-021-1/+1
| | | | | | | The string now resides in a central object file instead of being duplicated in every file that requires a version string. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31577 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Move and comment the .SUFFIXES rulediego2010-11-021-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31528 b3059339-0415-0410-9bf9-f77b7e298cf2
* build: Rename configure.log file to config.logdiego2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31415 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Add path.o to the dependency list of the loader test programsdiego2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31407 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Add a command to the binary build rule.diego2010-11-021-0/+1
| | | | | | This allows running the 'tests' and 'tools' targets again. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31402 b3059339-0415-0410-9bf9-f77b7e298cf2
* Makefile: Add missing '$' to EXESUF variable in binary build rule.diego2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31401 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_rgb2bgr: remove the filtersiretart2010-11-021-2/+1
| | | | | | | | | | Its functionality has been superseeded by sws by quite some time, and the "swap" functionality is now provided by vf_format. see http://comments.gmane.org/gmane.comp.video.mplayer.devel/55804 for a full discussion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31350 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31176Uoti Urpala2010-05-301-2/+2
|\
| * remove vf_yuy2, functionality is replaced by -vf format=yuv2siretart2010-05-141-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31173 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31169Uoti Urpala2010-05-301-15/+1
|\|
| * Remove internal liba52 copy.diego2010-05-091-15/+1
| | | | | | | | | | | | | | Nowadays FFmpeg is faster than liba52 and external liba52 is well supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
* | bstr.[ch]: add new files for struct bstr related functionalityUoti Urpala2010-05-201-0/+1
| | | | | | | | | | | | | | | | Move "struct bstr" definition from ebml.h to its own header and add some utility functions/macros. Change length field type from int to size_t and adjust using code accordingly. Partially based on a patch from Anton Khirnov.
* | af_lavcac3enc: make the filter work without FFmpeg internalsUoti Urpala2010-05-141-3/+3
| | | | | | | | | | | | | | The only FFmpeg internal symbols required were some constants. Define them in the file itself instead. Also add some checks and fixes to make the code more robust and fix a potential memory corruption problem.
* | Merge svn changes up to r31097Uoti Urpala2010-04-261-1/+2
|\|
| * Add sdl_common file and use it to share the input handling between -vo glreimar2010-04-251-1/+2
| | | | | | | |