summaryrefslogtreecommitdiffstats
path: root/mplayer.c
Commit message (Collapse)AuthorAgeFilesLines
* libass: match font attachments based on extensionGrigori Goronzy2010-06-011-4/+1
| | | | | | | Instead of only relying on the MIME type, use the file extension as a fallback for deciding which attachments are fonts and should be fed to libass. This also refactors the check into a separate function in mpcommon.
* Merge svn changes up to r31211Uoti Urpala2010-05-301-1/+1
|\ | | | | | | | | The merged cache2.c changes are known to have problems. Will merge further fixes to them before merging this to the master branch.
| * Use MP_NOPTS_VALUE as "default" pts for delayed frames instead of somereimar2010-05-231-1/+1
| | | | | | | | | | | | | | | | insanely large value. Avoids hang if a decoder handles the data/size == 0 condition incorrectly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31205 b3059339-0415-0410-9bf9-f77b7e298cf2
* | core: apply audio track options to all ordered chapter filesUoti Urpala2010-05-221-1/+6
| | | | | | | | | | | | | | Options selecting audio track to play (-nosound, -alang, -aid) only affected the first source file. When you moved to a timeline part that came from another file the default audio track for that file was used. Add code to apply the options to all files.
* | options: move -alang and -slang to option structUoti Urpala2010-05-221-13/+11
| | | | | | | | | | | | | | The option field corresponding to -slang is now called "sub_lang" instead of the old misleading global name "dvdsub_lang". The code handling -slang in subreader.c looks rather broken; disable it instead of converting it to use the option field.
* | vo_vdpau: support queuing an arbitrary number of frames aheadUoti Urpala2010-05-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Make the number of output surfaces allocated by vo_vdpau configurable and allow queuing multiple future frames with the VDPAU frame timing functionality. There are two known issues that could be polished in the future for particularly long queue time cases. First, toplevel code should possibly wait for the queued changes to finish displaying in some situations like switching files. Second, the VO can block waiting for a surface to become available, and in the worst case this wait can be almost as long as the maximum queuing time (potentially causing audio underruns). However those issues are not high priority.
* | mplayer.c: remove an unnecessary #includeUoti Urpala2010-05-081-1/+0
| |
* | Merge svn changes up to r31097Uoti Urpala2010-04-261-1/+2
|\|
| * Fix crash if a DVD is played with dvdnav:// and without videoreimar2010-04-251-1/+2
| | | | | | | | | | | | | | (e.g. because vo initialization failed). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31090 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30967Uoti Urpala2010-04-261-8/+2
|\|
| * Rename SetCodecPath() --> set_codec_path().diego2010-03-211-1/+1
| | | | | | | | | | | | | | This keeps the naming of all path-related functions consistent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30944 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-3/+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
| * Remove unnecessary #ifdefs around harmless loader/codecpath.h #include.diego2010-03-181-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30931 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Split codec path related code into a separate file to fix Windows build.reimar2010-03-181-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30930 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30917Uoti Urpala2010-04-261-0/+4
|\|
| * Follow a more proper way to support -codecpath.komh2010-03-171-0/+4
| | | | | | | | | | | | | | | | | | | | 1. Include loader/drv.h for SetCodecPath() instead of a declaration of it. 2. Move codec_path from get_path.h to mpcommon.h and mpcommon.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30914 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30907Uoti Urpala2010-04-261-0/+5
|\|
| * Add -codecpath option.komh2010-03-151-0/+5
| | | | | | | | | | | | | | | | It allows to search binary codecs in non-standard directories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30897 b3059339-0415-0410-9bf9-f77b7e298cf2
* | core: track current chapter for relative chapter seeksUoti Urpala2010-04-251-4/+19
| | | | | | | | | | | | | | | | | | | | Due to inexact seeks, chapter seek commands may result in a playback position that's inside the previous chapter. This causes problems when the user does repeated next-chapter/previous-chapter seeks, because the code will use the wrong base for calculating 'next' or 'previous'. Improve the behavior by adding a heuristic that keeps track of what chapter the user last wanted to seek to and adjusts the "current chapter" value based on that.
* | mplayer.c: silence some compiler warningsUoti Urpala2010-04-251-3/+5
| | | | | | | | No semantic changes.
* | commands: finish seeks before processing other commandsUoti Urpala2010-04-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code processing seek commands only sets/alters variables specifying the current seek target. Before all queued commands were processed first, and any needed seeks were executed after that. This was somewhat unreliable, as commands queued later were not guaranteed to see all the effects of earlier seek commands if they happened to be processed in the same batch. Change the behavior so that processing commands is interrupted and the real seek executed if the next command is anything other than a basic seek. This guarantees that other commands see a consistent state, while still allowing the combining of consecutive seeks (which is useful for example when the user keeps the seek-forward key pressed down, and key repeat is faster than seeks can be executed).
* | input: remove unused "paused" arguments from some functionsUoti Urpala2010-04-251-5/+5
| |
* | Fix chapter handling with first chapter not at beginning of fileUoti Urpala2010-04-251-1/+2
| | | | | | | | | | | | | | | | | | | | Before "-chapter 1" did nothing even if the first chapter didn't start at the beginning of file. Fix it. Before all chapter property commands (including chapter seek keys) failed if the current playback position was before the start of the first chapter. Now they'll work. Relative chapter seeks will go to the first chapter (even if that's in the wrong direction for backward seeks).
* | Fix -chapter with ordered chaptersUoti Urpala2010-04-251-6/+6
| | | | | | | | | | Move the code doing an initial seek specified by -chapter to a position where it works if ordered chapters are used.
* | options: move -chapter values to option structUoti Urpala2010-04-251-10/+11
| | | | | | | | | | | | | | | | | | | | | | -chapter can optionally take a range with a start and an end. Add a new option type which supports such values and use that instead of a custom per-option function. This commit also fixes a build configuration bug: before the availability of the -chapter option depended on DVD functionality being enabled in the binary, even though the option works with other sources too.
* | mplayer.c: share seek-reset code with chapter seeksUoti Urpala2010-04-251-53/+51
| | | | | | | | | | | | | | Move code resetting various things after a seek into a separate function and use that for chapter seeks too. In most cases this won't change behavior because chapter seeks were already falling back to the same time-based seek code.
* | Move seek-reset functionality out of demuxer.cUoti Urpala2010-04-231-3/+18
| | | | | | | | | | | | | | Move code for resetting decoders after seeks, chapter seeks and angle changes out of demuxer.c. This functionality belongs on a higher level; the demux layer can't always know what kind of reinitialization is required.
* | Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | | | | | | 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-1/+1
|\|
| * Use int64_t instead of long for variable containing current playback time.reimar2010-03-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30857 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add required mplayer.h and access_mpcontext.h #includes.diego2010-02-221-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30707 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30663Uoti Urpala2010-03-101-4/+5
|\| | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
| * Send VOCTRL_PAUSE/VOCTRL_RESUME events also when pausing for idle mode.reimar2010-02-191-0/+5
| | | | | | | | | | | | | | This makes the vos try to redraw the video if they can. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30660 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove some pointless '#if 1' preprocessor directives.diego2010-02-191-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30658 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30595Uoti Urpala2010-03-091-1/+0
|\| | | | | | | | | | | Conflicts: mplayer.c vidix/nvidia_vid.c
| * Declare vf_menu_pause_update in libmenu/menu.h.diego2010-02-141-1/+0
| | | | | | | | | | | | | | This avoids a forward declaration in mplayer.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30582 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid forward declarations for import_initial_playtree_into_gui() anddiego2010-02-141-3/+0
| | | | | | | | | | | | | | import_playtree_playlist_into_gui; declare them in interface.h instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30575 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add xscreensaver_heartbeat() declaration to x11_common.h.diego2010-02-141-6/+0
| | | | | | | | | | | | | | This avoids a forward declaration in mplayer.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30574 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare mp_input_register_options() in input/input.h.diego2010-02-141-2/+0
| | | | | | | | | | | | | | This also avoids a forward declaration in mplayer.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30572 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn change r30560Uoti Urpala2010-03-091-2/+2
|\|
| * Rename exit_reason_t enum to exit_reason and do not typedef it.diego2010-02-141-2/+4
| | | | | | | | | | | | | | The _t namespace is reserved for POSIX; the typedef is pointless obfuscation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30560 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30550Uoti Urpala2010-03-091-1/+6
|\|
| * Move the check for valid sh_video into the init_vo_spudec, this fixes a crashreimar2010-02-131-1/+6
| | | | | | | | | | | | | | when command.c calls this function without having to duplicate the check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30548 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for loading ASS subtitles through the stream layer and thus e.g.reimar2010-02-051-2/+2
| | | | | | | | | | | | | | | | from some network location. Patch by Yuriy Kaminskiy [yumkam mail ru] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30515 b3059339-0415-0410-9bf9-f77b7e298cf2
* | subs: support loading external ASS subtitles via stream layerUoti Urpala2010-03-091-2/+2
| | | | | | | | | | | | | | | | | | Previously the argument of the "-sub" option was always interpreted as a local filename when trying to read it as a libass file. Use the stream layer to read it instead, so that protocols like 'http://' are also supported like they are for the main video/audio file. Based on patch by Yuriy Kaminskiy <yumkam@mail.ru>
* | Merge svn changes up to r30475Uoti Urpala2010-03-091-0/+17
|\|
| * Add license header to all top-level files missing them.diego2010-01-301-0/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move the resync-related code into more consistent places instead of having itreimar2010-01-241-6/+0
| | | | | | | | | | | | | | scattered all over the place with half of it forgotten in some places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30420 b3059339-0415-0410-9bf9-f77b7e298cf2
* | translations: tweak cases that relied on concatenating adjacent stringsUoti Urpala2010-03-071-3/+4
| | | | | | | | | | | | | | | | Tweak some code parts that used to rely on string literals from translation macros being concatenated with other adjacent string literals. Break up the resulting string into independently translated parts, so that the existing translations for those parts can still be used.
* | Restore collapsed whitespace in output messagesUoti Urpala2010-03-071-4/+4
| | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations.
* | Make help text translatableUoti Urpala2010-03-071-2/+42
| | | | | | | | | | | | Translate help_text and also make all CONF_TYPE_PRINT option output translatable (though no translations exist yet for anything other than the main help text).
* | vo_vdpau: make queuing future frame flips adjustableUoti Urpala2010-02-051-4/+2
| | | | | | | | | | | | | | | | | | | | Add -vo vdpau suboptions "queuetime_windowed" and "queuetime_fs" to specify the maximum number of milliseconds how far into the future a frame flip can be queued using the VDPAU presentation queue functionality. The intended main use of these options is to allow disabling use of the queuing feature on systems where using it causes choppiness in other graphics behavior (this is an NVIDIA driver issue; the video itself isn't affected).
* | Disable libass fallbacks for fontconfig < 2.4.2Grigori Goronzy2010-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | libass doesn't support fontconfig < 2.4.2 so fallbacks for these ancient versions aren't needed anymore. Also update the man page (English, German) to reflect the change. Additionally note that -embeddedfonts controls the use of ASS script embedded fonts too. -embeddedfonts is now always enabled by default. Fonts are never extracted into a directory anymore but passed to libass via memory.
* | Merge svn changes up to r30419Uoti Urpala2010-01-251-2/+4
|\|
| * Change code to allow playing a stream even if enabling the cache failedreimar2010-01-231-2/+4
| | | | | | | | | | | | | | while still handling it when the user aborts the cache fill. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30402 b3059339-0415-0410-9bf9-f77b7e298cf2
| * At startup and while seeking avoid to introduce pointless sleeps and possiblyreimar