summaryrefslogtreecommitdiffstats
path: root/mplayer.c
Commit message (Collapse)AuthorAgeFilesLines
* 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 possiblyreimar2010-01-041-0/+12
| | | | | | | | | | | | | | desync due to codec delay. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30218 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Also reset time_frame and next_frame_time on reset, it makes no sense toreimar2010-01-041-4/+5
| | | | | | | | | | | | | | | | process the sleep before playing the frame seeked to and can be annoying when the user tries to escape a series of "stuck" frames with a huge duration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30217 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Avoid misleading error "ASS: cannot add video filter"Uoti Urpala2010-01-161-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using libass with a VO that has direct EOSD support the vf_ass video filter is unnecessary and is not added automatically, but the code that adds the filter when it is needed produced misleading output messages in this case. The following two messages were printed at MSGL_ERR level, making it look like an error condition: Couldn't open video filter 'ass'. ASS: cannot add video filter Add a version of vf_open_plugin() called vf_open_plugin_noerr() that does not itself print an error message if opening a vf fails and that returns the exact status code returned by the vf open() function. Make vf_ass return a different status code depending on whether there was an actual error or if it determined a filter would be redundant. Use the _noerr function in the code adding the filter to avoid the first message and check the status code to avoid the second.
* | subtitles: avoid running subreader.c parser when using libassUoti Urpala2010-01-161-19/+22
| | | | | | | | | | | | | | | | | | When loading external subtitle files, the code always tried parsing the file with subreader.c sub_read_file() first, even if libass was then used to parse and render the file (the results of the first parsing would be ignored in that case). This could cause problems like unnecessary error messages. Change the code to try libass parsing first if enabled, and skip subreader.c parsing if that succeeds.
* | translations: add infrastructure for translated OSD messagesUoti Urpala2010-01-121-6/+21
| | | | | | | | | | | | | | Add function set_osd_tmsg() which is a version of set_osd_msg that translates its format argument. Pass OSD message strings in the command.c property_osd_display table through mp_gtext before they're used.
* | Merge svn changes up to r30185Uoti Urpala2010-01-081-0/+4
|\|
| * Fixup SDL configure check:reimar2010-01-031-0/+4
| | | | | | | | | | | | | | | | | | | | - Make it work without sdl-config which adds at least useless or even hurtful cflags and also does not work for cross-compiling - If using sdl-config, make it use the CFLAGS we actually use for compiling instead of something else. Thus #undef main is needed in the test program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30136Uoti Urpala2009-12-301-0/+7
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * Set some freed pointers to NULL.reimar2009-12-261-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30118 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Free playtree_iter upon exiting MPlayerreimar2009-12-261-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30117 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove more direct includes of libass/ass.hreimar2009-12-241-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30105 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add braces to avoid ambiguous else.reimar2009-12-071-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29979 b3059339-0415-0410-9bf9-f77b7e298cf2
* | audio: Remove fixed decode_audio() return size limit (MAX_OUTBURST)Uoti Urpala2009-12-291-48/+41
| | | | | | | | | | | | | | | | | | | | | | | | A couple of months ago MPlayer's ALSA driver started rounding the amount of input data it was willing to accept in one call down to an integer multiple of the value it set in ao_data.outburst. In some configurations it was possible for this value to exceed the 64 KiB limit on the amount MPlayer was willing to write in a single call to the AO. As a result ao_alsa accepted 0 bytes in each play() call and audio playback failed. Fix this by removing the fixed 64 KiB limit on the amount of audio sent to AO at once; the limit was mostly a remnant of older code anyway.
* | Fix printf format strings with invalid '%lf' conversionUoti Urpala2009-12-151-1/+1
| | | | | | | | | | | | | | Some code used an invalid '%lf' conversion specification for double arguments. Maybe they were written that way due to confusion with scanf where doubles are indicated by '%lf'; however it is not a valid printf format specifier. Change those cases to use '%f'.
* | -identify output: use ordered chapters length for ID_LENGTHUoti Urpala2009-12-131-1/+3
| | | | | | | | | | | | Print the overall timeline length as ID_LENGTH instead of the length of the main file. This may help external GUIs handle ordered chapters somewhat better.
* | options: Move ass_enabled to options structUoti Urpala2009-12-021-5/+6
| |
* | core: Fix timeline state at start of playbackUoti Urpala2009-12-021-2/+2
| | | | | | | | | | | | A timeline starting in the middle of a source file resulted in initial playback state not being set up properly. Fix this by forcing an absolute seek to initialize timeline state before playback starts.
* | mplayer.c: Remove unneeded blit_frame argumentsUoti Urpala2009-12-021-10/+7
| | | | | | | | | | | | | | The video updating functions no longer need to separately track whether a frame is available for flipping. That information is now available in video_out->frame_loaded, and all the separate tracking did was present opportunities for things to go out of sync.
* | core: Fix ordered chapter timeline building memory corruptionUoti Urpala2009-12-021-2/+5
| | | | | | | | | | | | | | | | | | Two arrays were allocated one element too small, causing writes beyond the allocated area. The bug was triggered when playing a Matroska file with ordered chapters where each chapter came from a different source and none of the sources was the original file. Noticed by Daniel Dawson <ddawson@icehouse.net>
* | Merge svn changes up to r29971Uoti Urpala2009-11-291-0/+1
|\|
| * Readjust the global number of subs when switching dvdnav track to takereimar2009-11-241-0/+1
| | | | | | | | | | | | | | into account any change in the number of DVD subtitles available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29964 b3059339-0415-0410-9bf9-f77b7e298cf2
* | core: Fix rare corner cases in video frame generationUoti Urpala2009-11-231-3/+3
| | | | | | | | | | | | | | Check that frames added by filters reach the screen and are not just buffered by the VO, and give filters a chance to output added frames if previous frame at EOF was buffered by VO. It's unlikely that anyone ever noticed practical problems caused by these issues.
* | core: Handle VO-added frames even with correct-pts disabledUoti Urpala2009-11-231-3/+7
| | | | | | | | | | | | At least show the extra frames even if correct-pts mode is disabled. They cannot be timed properly though; the most practical way to fix that is to just move to correct-pts mode instead.
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-4/+0
|\|
| * Remove useless check for valid fd with -dumpstream, the code does notreimar2009-11-171-4/+0
| | | | | | | | | | | | | | necessarily need it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29927 b3059339-0415-0410-9bf9-f77b7e298cf2
* | core: Do OSD/subtitle updates at a more accurate pointUoti Urpala2009-11-221-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OSD contents such as video position and non-libass subtitles were updated just before feeding a video frame through filters. The updates were done at that point mainly for the benefit of vf_expand OSD rendering functionality, which draws the OSD contents when the frame passes through that filter. However this gave the wrong results for VO-drawn OSD if the f