summaryrefslogtreecommitdiffstats
path: root/mplayer.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* 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
* 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
* 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
* Check that mpctx->audio_out is not NULL when trying to uninit it.reimar2009-11-131-1/+2
| | | | | | | | Make audio uninit consistent with e.g. the demuxer uninit code and also avoids a possible crash. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29908 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added -name, -title and -use-filename-title options and implementation in ↵ptt2009-11-121-1/+5
| | | | | | X11 vos git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29904 b3059339-0415-0410-9bf9-f77b7e298cf2
* Whitespace cosmetics: fix pause_loop indentation/remove inconsistently used ↵reimar2009-11-111-37/+37
| | | | | | tabs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29899 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not call resume on unpausing if we have already reached eof whilereimar2009-11-111-0/+3
| | | | | | | being paused (e.g. because of a "pausing_keep_force pt_step 1"). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29898 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remember which subtitle was auto-selected for dvdnav due to -slangreimar2009-11-111-1/+14
| | | | | | | | | | and if it is unchanged re-apply -slang on stream reset. This makes -slang work when used with menu navigation or in general when the subtitle is not available for parts of the playback or the subtitle stream ID changes during playback. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29897 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factor out code that decides which subtitle to play.reimar2009-11-111-24/+28
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29896 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use switch_program property from mplayer.c to set ts_prog.reimar2009-11-071-0/+4
| | | | | | | | This seems to leave the ts demuxer unaffected, but fixes -tsprog with the lavf demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29846 b3059339-0415-0410-9bf9-f77b7e298cf2
* Whitespace cosmetics: reindent reinit_audio_chain functionreimar2009-11-061-43/+43
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29843 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some useless comments/commented-out code.reimar2009-11-061-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29842 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split assignment from error value check to avoid overcomplicated if () ↵reimar2009-11-061-2/+3
| | | | | | condition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29841 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reuse the init_error exit path also for init_best_audio_codec errors.reimar2009-11-061-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29840 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify: use &= instead of a = b & a;reimar2009-11-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29839 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unnecessary else blocksreimar2009-11-061-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29838 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use an early return instead of a {} block over the whole function in ↵reimar2009-11-061-2/+2
| | | | | | reinit_audio_chain git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29837 b3059339-0415-0410-9bf9-f77b7e298cf2
* Disable audio when initializing the filter chain fails (can happen e.g. when ↵reimar2009-11-061-7/+8
| | | | | | | | | | | the hwmpa decoder is used but the hardware does not support hardware MPEG audio). Otherwise this will lead to a crash later on when the decode code tries to access the audio filter chain. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29836 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change dvdnav_reset_stream to not disable subtitles, since that breaksreimar2009-11-051-2/+0
| | | | | | | | | selecting the subtitle via -slang or -sid. It is quite possible that removing it will cause other issues, though I could not see any with the DVDs I had available for testing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29827 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -nosub work to disable subtitles even if -slang and dvd streams are used.reimar2009-09-291-2/+0
| | | | | | | This still needs some additional checking that subtitle selection via dvdnav works. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29732 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a -nosub option that allows disabling auto-selected subtitles as e.g. thereimar2009-09-281-4/+4
| | | | | | | mkv demuxer supports. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29730 b3059339-0415-0410-9bf9-f77b7e298cf2
* Enable loading of external subtitles also for audio-only files.reimar2009-09-281-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29728 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use a_pos to update subtitle for audio-only files instead of ↵reimar2009-09-281-1/+1
| | | | | | | | | mpctx->sh_audio->pts which e.g. for mp3 in AVI never has a useful value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29727 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for displaying subtitles on the command-line when playingreimar2009-09-231-0/+23
| | | | | | | audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29712 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make update_subtitles work without sh_video for text subtitles.reimar2009-09-231-3/+3
| | | | | | | | | This fixes a crash with e.g. auto-enabled subtitles and -novideo due to command.c calling update_subtitles even without video and is a step toward subtitle support for audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29710 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge two Windows-specific #if sections to simplify the condition.reimar2009-09-161-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29684 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack: set DEP/NX on Windows via SetProcessDEPPolicy.reimar2009-09-161-0/+7
| | | | | | | | This should really be done via the NXCOMPAT PE flag, but looks like binutils will not get support for it any time soon and not having this security feature enabled is just ridiculous. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29683 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, fix misplaced check in r29613, for loop detection we must comparereimar2009-09-021-1/+1
| | | | | | | | current file name against full name to be added, not current file name against new base path. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29637 b3059339-0415-0410-9bf9-f77b7e298cf2
* Limit amount of data allocated on stack, strlen(filename) is not a good idea forreimar2009-09-021-2/+6
| | | | | | | file name strings that might come from arbitrary playlists, use PATH_MAX instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29636 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for directory-specific mplayer.conf configuration file.reimar2009-09-021-3/+11
| | | | | | | Patch by Christian P. Schmidt "schmidt digadd de" git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29634 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make the loop detection for mov reference files less aggressive, fixesreimar2009-09-011-1/+5
| | | | | | | playback of http://stream.qtv.apple.com/qtv/wgbh/http/nova_eu/nova_eu_3012c01_mp4_ref.mov git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29613 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix per-file config file loading for DOS paths (i.e. where \ and : canreimar2009-08-311-1/+10
| | | | | | | also separate path and file name). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29604 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factor out code to try and load a config file only if it exists.reimar2009-08-311-11/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29603 b3059339-0415-0410-9bf9-f77b7e298cf2
* Only #include stream/dvbin.h when DVB is enabled.diego2009-08-031-0/+2
| | | | | | | | dvbin.h #includes some system DVB headers that may be unavailable. Fixes compilation with DVB disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29474 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefs around harmless internal header #includes.diego2009-08-021-14/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29471 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make ID_SEEKABLE depend on both the stream and the demuxer being seekable,reimar2009-05-311-1/+2
| | | | | | | | | instead of only depending on the stream. This makes the value correctly 0 e.g. for AVI files without index. Patch by Jason Tackaberry [tack urandom ca] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29331 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, demuxer info tags are _not_ case sensitive, so use strcasecmp.reimar2009-05-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29329 b3059339-0415-0410-9bf9-f77b7e298cf2
* whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-91/+91
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* sane verbosity levels for menu initializationdiego2009-04-251-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29231 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.ramiro2009-04-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29154 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set the forced_subs_only value correctly whenever a new spudec is created.reimar2009-03-301-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29108 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make pausing_keep_force the default for the set_mouse_pos and key_down_event -reimar2009-03-071-2/+1
| | | | | | | | | different behaviour is unlikely to make sense but it is better to handle this in input.c instead of adding special cases to mplayer.c and being able to override the default behaviour at least should not hurt. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28870 b3059339-0415-0410-9bf9-f77b7e298cf2
* Print the version string after the command line has been parsed.diego2009-02-211-1/+2
| | | | | | | | This allows printing the CPU information when verbose mode is triggered on the command line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28691 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add priority support for OS/2 and factorize the Windows priority support.diego2009-02-101-13/+6
| | | | | | | patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28520 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use SetErrorMode so Windows will not show all kinds of error dialogsreimar2009-02-091-0/+2
| | | | | | we do not want. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28497 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not print a warning if current pts is equal to previous pts.diego2009-02-011-2/+2
| | | | | | | patch by Dennis Vshivkov, jaimor orcon net nz git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28445 b3059339-0415-0410-9bf9-f77b7e298cf2
* increase max OSD message size limitcompn2009-02-011-6/+6
| | | | | | | patch by Scaevolus on irc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28413 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factorize print_version().diego2009-01-251-42/+1
| | | | | | | Print CPU information in verbose mode instead of by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28360 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, mixed up ao_data.samplerate and ao_data.bps when calculating sleep time.reimar2009-01-161-1/+1
| | | | | | | Fixes stuttering audio when playing audio-only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28329 b3059339-0415-0410-9bf9-f77b7e298cf2
* More #ifdef -> #ifreimar2009-01-161-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28324 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing const qualifier to mpctx_get_audio_out function declaration.diego2009-01-101-1/+1
| | | | | | | | This fixes the warning: mplayer.c:381: warning: return discards qualifiers from pointer target type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28294 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid a uselessly high number of wakeups when playing audio-only files.reimar2009-01-011-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28220 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of pointless 'extern' keywords.diego2008-12-031-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* Print ID_EXIT and exit reason message in identify mode when exiting.reimar2008-12-021-21/+36
| | | | | | | Patch by rvm [rvm3000 ya com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28066 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reimplement -endchapter support again for -dump*, it was broken in r25987.reimar2008-11-231-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27987 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add an option that sets initial playback volume.diego2008-10-311-0/+3
| | | | | | | patch by Reimar and rvm, rvm3000 ya com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27872 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factorize vobsub idx/extradata handling.aurel2008-10-271-30/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27841 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid calling init_vo_spudec() too early.aurel2008-10-271-1/+1
| | | | | | | (before mpctx->d_sub->sh initialization) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27839 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.diego2008-10-131-11/+11
| | | | | | | This avoids a pointless indirection that only obscures what is really done. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
* slave command to get the number of chapters; patch by Kevin DeKorte - ↵nicodvb2008-09-261-0/+5
| | | | | | kdekorte gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27667 b3059339-0415-0410-9bf9-f77b7e298cf2
* Since the pause loop now also runs commands, set mpctx->was_pausedreimar2008-09-251-1/+1
| | | | | | before entering it for more consistency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27666 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add an experimental pausing_keep_force slave mode command prefixreimar2008-09-251-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27665 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use translatable string instead of hardcoded message for process priority.diego2008-08-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27445 b3059339-0415-0410-9bf9-f77b7e298cf2
* Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-071-6/+6
| | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename font-related preprocessor directives.diego2008-08-071-6/+6
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename a bunch of miscellaneous preprocessor directives.diego2008-08-071-1/+1
| | | | | | |