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