summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sub.h: Remove obsolete code under #if 0Uoti Urpala2008-05-011-10/+0
| | | | | According to the comment this was once a way to disable subtitles, but changing the #if 0 to #if 1 couldn't have compiled for years.
* Move aspect.c options to option structUoti Urpala2008-05-014-20/+18
|
* libvo: Move aspect.c static variables to vo structUoti Urpala2008-05-0111-110/+128
| | | | This moves non-option variables. aspect.c still defines option globals.
* sub.c: Make tables constUoti Urpala2008-05-012-4/+4
|
* Merge svn changes up to r26624Uoti Urpala2008-05-0123-113/+154
|\ | | | | | | | | | | Conflicts: Makefile
| * Only warn if both font family and it's full name are different from requested.eugeni2008-05-011-3/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26624 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow inexact font family matching.eugeni2008-05-011-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SSA/ASS fonts are sometimes referenced by their "full name", which is usually a concatenation of family name and font style (ex. Ottawa Bold). Full name is available from FontConfig pattern element FC_FULLNAME, but it is never used for font matching. Therefore, I'm removing words from the end of the name one by one, and adding shortened names to the pattern. It seems that the first value (full name in this case) has precedence in matching. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26623 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove tools on distclean, not on clean.diego2008-04-301-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26622 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add testclean target and make distclean depend upon it.diego2008-04-301-2/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26621 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Introduce TEST_OBJS variable for objects to link all test files againstdiego2008-04-301-10/+9
| | | | | | | | | | | | | | and share it with the tools. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26620 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set libdvdcss CFLAGS for dvdread from configure.diego2008-04-302-4/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26619 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmeticsdiego2008-04-301-22/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26618 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add new tests target to build all test programs and remove them on distclean.diego2008-04-301-2/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26617 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Link loader test files against mp_msg-mencoder.o instead of mp_msg.o.diego2008-04-301-1/+1
| | | | | | | | | | | | | | The former does not pick up GUI dependencies. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26616 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add compilation rule for libvo/aspecttest and (hackishly) fix linking.diego2008-04-302-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26615 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove libass dependency on global font_fontconfig variable.eugeni2008-04-305-9/+26
| | | | | | | | | | | | | | | | | | A new function (ass_set_fonts_nofc) is introduced instead of an extra argument to existing ass_set_fonts to keep binary compatibility with older versions of the library. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26614 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add $(EXESUF) to test rules.diego2008-04-301-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26613 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove loader/wine/avifmt.h #include, the AVI types declared there conflictdiego2008-04-301-1/+0
| | | | | | | | | | | | | | with the ones from libmpdemux/aviheader.h, which is #included below. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26612 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing string.h #include to fix a bunch of implicit declaration warnings.diego2008-04-301-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26611 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused fast_memcpy() function and link against the object thatdiego2008-04-302-7/+2
| | | | | | | | | | | | | | contains fast_memcpy() instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26610 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Move some variable declarations to better places.diego2008-04-301-16/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26609 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Disable unused function.diego2008-04-301-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26608 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark all functions that are only used within the file as static.diego2008-04-308-18/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26607 b3059339-0415-0410-9bf9-f77b7e298cf2
| * The recurse target does not depend on help_mp.h.diego2008-04-301-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26606 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make the default target depend on the recurse target again so that thediego2008-04-301-3/+1
| | | | | | | | | | | | | | all necessary subdirectories are recursed by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26605 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Explicitly declare which dependency files need generated headers.diego2008-04-301-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26604 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use consistent include paths, we always build from the top level now.diego2008-04-301-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26603 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary version.h #includes.diego2008-04-305-7/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26602 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rebuild version.h only when the working directory was updated.diego2008-04-301-2/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26601 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sync codec short name changes from FFmpeg.diego2008-04-301-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26600 b3059339-0415-0410-9bf9-f77b7e298cf2
* | input.c: Use talloc for all memory allocationsUoti Urpala2008-05-011-14/+10
| | | | | | | | | | | | Convert the remaining non-talloc memory allocations so that everything in the file consistently uses talloc. Make one additional minor code simplification in read_cmd.
* | Move input options to option structUoti Urpala2008-04-306-41/+62
| |
* | options: Make dynamic dup hack work with new optionsUoti Urpala2008-04-301-4/+7
| | | | | | | | | | | | | | | | The option system has a hack that converts default values (potentially constants) of dynamically allocated options to allocated ones when the options are first added to the config system, so that all values can be equally freed later. Make this work with new-style options in the option struct too.
* | m_config.c: Cosmetics: fix nested block lacking indentationUoti Urpala2008-04-301-16/+17
| |
* | input: Use talloc for struct mp_cmd and things under itUoti Urpala2008-04-301-28/+12
| |
* | input: Move command filedescriptor list to context structUoti Urpala2008-04-303-30/+35
| |
* | input: Move cmd_queue to context structUoti Urpala2008-04-3016-46/+57
| | | | | | | | Menu instances now also need a input context pointer to queue commands.
* | input.c: Change a static variable to localUoti Urpala2008-04-301-14/+16
| |
* | input: Move key filedescriptor list to context structUoti Urpala2008-04-306-39/+53
| | | | | | | | | | The context variable is now passed to VOs too as it's now needed to add a callback on the X filedescriptor.
* | input.c: Move variable from static to localUoti Urpala2008-04-301-2/+1
| |
* | input.c: Move key down state to context structUoti Urpala2008-04-301-33/+36
| |
* | input.c: Use talloc for command bind allocationsUoti Urpala2008-04-301-31/+11
| |
* | input.[ch]: Move some type definitions from .h to .cUoti Urpala2008-04-302-10/+10
| | | | | | | | These aren't used outside input.c.
* | input.c: Remove mp_input_ prefixes from static function namesUoti Urpala2008-04-301-60/+58
| | | | | | | | The prefixes make the code unnecessarily verbose for no real benefit.
* | input.c: Make two functions staticUoti Urpala2008-04-301-3/+3
| |
* | Remove INITIALIZED_INPUT from mpctx->initialized_flagsUoti Urpala2008-04-303-14/+12
| | | | | | | | | | The input functions are never uninited except at exit. Move the uninit to player exit function and remove the flag.
* | input: Move command bind variables to context structUoti Urpala2008-04-304-62/+73
| |
* | Create a context for input.c stateUoti Urpala2008-04-306-59/+80
| | | | | | | | | | | | | | | | | | Start moving static variables to a context struct. Only autorepeat state is moved to the struct in this commit. mp_input_check_interrupt now requires the context variable. Change stream functions to pass it. It's still stored in a static variable in stream/.
* | mencoder.c: Remove unused functionUoti Urpala2008-04-301-5/+0
| | | | | | | | | | | | mp_check_interrupt_callback should have been removed when stream_set_interrupt_callback was added as stream no longer requires the symbol.
* | input.c: Remove _st prefix from struct namesUoti Urpala2008-04-301-4/+4
| |
* | Merge svn changes up to r26599Uoti Urpala2008-04-305-66/+73
|\|
| * Move CFLAGS setting to configure.diego2008-04-292-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26599 b3059339-0415-0410-9bf9-f77b7e298cf2
| * change cvs > svncompn2008-04-291-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26598 b3059339-0415-0410-9bf9-f77b7e298cf2
| * add info lines to ffmimic, ffkmvc. fixes codec-status table.compn2008-04-291-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26597 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Link tools against mp_msg-mencoder.o instead of mp_msg.o.diego2008-04-291-1/+1
| | | | | | | | | | | | | | The latter may depend on the GUI and cause link failures. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26596 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge mpcommon.mak into Makefile.diego2008-04-292-30/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26595 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Move version.h/help_mp.h generation rules to a better place.diego2008-04-291-22/+22
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26594 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: Add missing \ for line continuation.diego2008-04-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26593 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not rebuild version.h at every Makefile change.diego2008-04-291-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26592 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert clean/distclean into non-recursive targets.diego2008-04-291-3/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26591 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove generated headers and generated helper binaries only on distclean.diego2008-04-291-4/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26590 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unnecessary dependency declaration.diego2008-04-291-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26589 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge nearly identical SRCS_COMMON lines.diego2008-04-291-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26588 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Move allocation/free of x11 struct to x11_common.cUoti Urpala2008-04-293-4/+7
| | | | | | | | Allocate the struct in the init function and free in uninit.
* | Mark option -key-fifo-size globalUoti Urpala2008-04-291-1/+1
| | | | | | | | | | | | | | The fifo is only allocated once and not resized later. After the previous commit trying to change it for later files would have no effect. With older code it could cause memory corruption if you set the option to a value larger than the already allocated size.
* | Move key_fifo_size & doubleclick_time to options structUoti Urpala2008-04-296-13/+16
| |
* | Add a context for mp_fifoUoti Urpala2008-04-2915-160/+192
| | | | | | | | | | Store data in an allocated context and take it as an argument instead of using static variables.
* | mp_fifo.c, osdep/: Include corresponding .h in .c filesUoti Urpala2008-04-296-0/+9
| |
* | vo_macosx: Include header instead of "extern ..."Uoti Urpala2008-04-291-2/+1
| |