summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | with SDL backend and -vo sdl. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31074 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31033Uoti Urpala2010-04-261-8/+8
|\|
| * Generate dependency information as a sideeffect of compilation.diego2010-04-061-9/+0
| | | | | | | | | | | | | | | | This speeds up compilation times, simplifies the code and fixes dependency file generation in libav*. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31026 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30967Uoti Urpala2010-04-261-4/+7
|\|
| * cosmetics: Break some overly long lines.diego2010-03-261-3/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30963 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename get_path.[ch] --> path.[ch].diego2010-03-201-1/+1
| | | | | | | | | | | | | | These files now contain different functions related to path handling. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move SetCodecPath() from loader to get_path.c and make it unconditional.diego2010-03-201-1/+0
| | | | | | | | | | | | | | | | This fixes compilation with the Win32 loader disabled but other binary codec loaders enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30942 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Split codec path related code into a separate file to fix Windows build.reimar2010-03-181-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30930 b3059339-0415-0410-9bf9-f77b7e298cf2
* | build: create and install .mo translation filesUoti Urpala2010-04-011-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If --enable-translation was specified to configure, build and install .mo files for the selected message language(s). The languages enabled can be chosen with the --language-msg option; by default all available ones will be installed. The .po source files for available languages are seached under the po/ subdirectory; at the moment that subdirectory is not included in the sources so no languages will be enabled unless you add the actual translations before running configure. The .mo files are created in the locale/ subdirectory when compiling. By default MPlayer will only look for them in the installed location, so the newly compiled .mo files will not be found if you run MPlayer without installing. You can set the MPLAYER_LOCALEDIR environment variable to point to the locale/ directory to test the translations without installing.
* | Makefile: fix %.S rule (broke loader build on x86)Uoti Urpala2010-03-101-1/+1
| | | | | | | | | | The rule merged from svn used "ASFLAGS" which was set for FFmpeg only. Change it to use CFLAGS instead (ASFLAGS is the same in svn).
* | Delete things related to old translation systemUoti Urpala2010-03-101-8/+4
| | | | | | | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* | Merge svn changes up to r30876Uoti Urpala2010-03-101-0/+2
|\|
| * Implement DirectShow filter graph.sesse2010-03-081-0/+1
| | | | | | | | | | | | | | | | | | | | DirectShow specifies that a filter (codec) can expect JoinFilterGraph to be called, and store a reference to the graph manager. Implement a very bare-bones graph manager (all functions are stubs, and no extra interfaces are implemented) and give it to the codec on init. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30866 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable ASS/SSA subtitle support in mencodergreg2010-03-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | Enable ASS/SSA rendering through libass in mencoder. This duplicates a bit of code (to parse font attachments, for example). Additionally, add a filter "fixpts" that generates PTS, simulating fixed fps. PTS generated by this filter are then used for subtitle timing. Original patch by Nicolas George. (nicolas.george normalesup.org) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30849 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30732Uoti Urpala2010-03-101-0/+4
|\|
| * Disable old-style implicit rules to fix MinGW/Cygwin compilationreimar2010-02-231-0/+10
| | | | | | | | | | | | | | | | (mplayer-rc.o can not be generated). TO be improved or removed if/when someone figures out the issue. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30725 b3059339-0415-0410-9bf9-f77b7e298cf2
| * FFmpeg: Add tomi to architecture list.diego2010-02-201-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30664 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename gui/mplayer/gtk/menu.[ch] --> gui/mplayer/gtk/gtkmenu.[ch].diego2010-02-141-1/+1
| | | | | | | | | | | | | | This avoids confusion with headers of the same name in other places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30573 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile: remove outdated vf_halfpack entryUoti Urpala2010-03-091-1/+1
| | | | | | | | | | Remove an outdated entry left over from when vf_halfpack depended on libswscale internals.
* | Merge svn changes up to r30550Uoti Urpala2010-03-091-4/+7
|\|
| * osdep/mplayer.rc.o depends on version.h.diego2010-02-131-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30549 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix linking of loader test programs when loader is disabled.diego2010-02-121-3/+6
| | | | | | | | | | | | | | Dependencies were only set correctly if the loader code was enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30542 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30529Uoti Urpala2010-03-091-4/+8
|\|
| * Fix linking of mp3lib test programs when internal mp3lib is disabled.diego2010-02-081-2/+4
| | | | | | | | | | | | | | Dependencies were only set correctly if internal mp3lib was enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30528 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix linking of liba52 test program when internal liba52 is disabled.diego2010-02-081-2/+4
| | | | | | | | | | | | | | Dependencies were only set correctly if internal liba52 was enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30527 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30484Uoti Urpala2010-03-091-0/+1
|\|
| * Add OS/2 KAI audio driver supportkomh2010-02-011-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | build: remove separate mp_msg-mencoder.cUoti Urpala2010-03-091-3/+2
| | | | | | | | | | | | mp_msg-mencoder.c was separate from mp_msg.c only to compile a version without a GUI dependency when the internal GUI was enabled. Since the GUI has been removed the same mp_msg.o can be linked in all binaries.
* | Makefile: vf_halfpack no longer needs libswscale internalsUoti Urpala2010-02-261-2/+2
| | | | | | | | | | vf_halfpack now uses only the public libswscale API, so compile it unconditionally.
* | Merge branch 'matroska'Uoti Urpala2010-01-281-1/+3
|\ \
| * | matroska: add new parsing codeUoti Urpala2010-01-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new EBML parser implementation that should allow significant improvements to the Matroska demuxer. The new parsing code is not actually used yet by the demuxer. The only changes to existing code in this commit are to generate the MATROSKA_ID_* / EBML_ID_* macro definitions from the new implementation and to rename some of them (the new implementation uses names matching the official Matroska spec). The main parser implementation is added in ebml.c. There are two new generated files, ebml_defs.c and ebml_types.h, that contain definitions of EBML elements. Those are generated by the new script TOOLS/matroska.py. There's a new Makefile target "generated_ebml" that run the script to refresh the content of the generated files.
* | | Merge svn changes up to r30301Uoti Urpala2010-01-251-2/+2
|\ \ \ | |/ / |/| / | |/
| * Make ad_hwac3 independent of liba52. Needs a minor amount of code duplication,reimar2010-01-111-2/+2
| | | | | | | | | | | | | | though that is already done that way for dts support in hwac3. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30280 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Update internal libass copy to commit 8db4a5greg2010-01-081-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30242 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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