summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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