summaryrefslogtreecommitdiffstats
path: root/mplayer.c
Commit message (Collapse)AuthorAgeFilesLines
* add new -subfont option, that allows having a different font for OSD ↵ben2007-05-201-0/+5
| | | | | | (controls and menu) and subtitles git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
* Output message fixuau2007-05-141-1/+1
| | | | | | | Add missing '\n' to "pts value <= previous", change level to INFO git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23312 b3059339-0415-0410-9bf9-f77b7e298cf2
* Gui --> guidiego2007-04-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
* big surprise.. uau broke gcc 2.95 as usualrfelker2007-04-171-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23011 b3059339-0415-0410-9bf9-f77b7e298cf2
* Gui: Show correct time after seeking in audio-only files.cehoyos2007-03-311-1/+1
| | | | | | | | Patch by Onur Küçük, onur.--.-.delipenguen.net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22853 b3059339-0415-0410-9bf9-f77b7e298cf2
* Code cleanup: don't include a .c file in mplayer.c and fix a fewrathann2007-03-291-1/+1
| | | | | | | | | | | "implicit declaration of function ‘mplayer_put_key’" warnings Based on Attila's suggestions. Approved by Uoti and Ivan. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
* Gui: Allow progress bar to move when playing mov or mp4 filescehoyos2007-03-261-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22826 b3059339-0415-0410-9bf9-f77b7e298cf2
* Invert logic for HAVE_NO_POSIX_SELECT to HAVE_POSIX_SELECT to be in linediego2007-03-211-1/+1
| | | | | | | with the other HAVE_ #defines throughout the codebase. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22769 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow demuxers to return packets with no pts in -correct-pts modeuau2007-03-111-2/+0
| | | | | | | | | as long as there are enough pts values for frames that the decoder returns. This should allow passing NAL units individually. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22516 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move the sh_audio->delay field to mpctx->delay.uau2007-03-111-14/+15
| | | | | | | | The value is related to overall a/v sync and is not used by audio demuxers or decoders. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22506 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix bad uninit when switching DVB channels.reimar2007-03-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22476 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix copy-paste bug (must have broken something in the GUI)uau2007-03-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22429 b3059339-0415-0410-9bf9-f77b7e298cf2
* Seek to -ss position, not 0, in per-file loop.uau2007-03-011-1/+1
| | | | | | | Fixes -ss combined with per-file loop after r22356. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22383 b3059339-0415-0410-9bf9-f77b7e298cf2
* Seek to -ss position without first starting audio/video from the start.uau2007-02-271-14/+11
| | | | | | | | Manual seeks no longer shift -endpos position (hopefully no one considered that a "feature"). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22356 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some #if 0 codeuau2007-02-241-30/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22331 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move parsing of the -ss option to the option code.uau2007-02-241-11/+3
| | | | | | | Also fixes a memory leak of the parameter string. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22330 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix error in commentuau2007-02-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22320 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reset the edl_decision flag after the seek is done.uau2007-02-231-0/+1
| | | | | | | Previously it affected every later seek (even in other files). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22319 b3059339-0415-0410-9bf9-f77b7e298cf2
* Separate function for seekinguau2007-02-231-36/+49
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22318 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless fflush(stdout) calls. mp_msg already flushes output, anduau2007-02-221-6/+1
| | | | | | | there is no other output before the calls. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22317 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move EDL code to separate functionsuau2007-02-221-46/+58
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22316 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix nonsense function typeuau2007-02-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22308 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cleanup, move "global" state from the frame_time_remaining mainloopuau2007-02-211-3/+8
| | | | | | | variable to mpctx. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22306 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix GUI compilationuau2007-02-211-0/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22304 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing "if (use_gui)" before some GUI callsuau2007-02-211-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22303 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix menu to work with mpctxuau2007-02-211-3/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22302 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing #ifdefuau2007-02-211-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22299 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split command/property handling from mplayer.c to a new file command.c.uau2007-02-211-2484/+480
| | | | | | | | | Move some global and static variables under a struct that can be given as a parameter. Add a context argument to the property functions so that they do not have to depend on global/static variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22298 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove remnants of the nonfunctional "grab_frames" command.uau2007-02-191-4/+0
| | | | | | | The command has been a no-op for years. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22273 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variable "osd_level_saved"uau2007-02-181-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22254 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure that -sid works even if the number of subtitles initially detectedreimar2007-02-171-0/+1
| | | | | | | | by the demuxer is smaller. Should improve a bit problems with non-selectable DVD/VOB subtitles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22252 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move some subtitle handling from mplayer.c to mpcommon.c and share it with ↵reimar2007-02-171-130/+5
| | | | | | mencoder.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clear/update subtitles after seeking backwards.reimar2007-02-111-11/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22202 b3059339-0415-0410-9bf9-f77b7e298cf2
* reindentuau2007-02-061-33/+33
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22163 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix multiple appearing or appearing+disappearing subs in the same frame uau2007-02-061-6/+5
| | | | | | | | in non-ASS mode. The latter is common (old sub replaced by new) and resulted in an incorrect frame where both appeared simultaneously. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22162 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing type to declaration and remove unused variableuau2007-02-051-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22161 b3059339-0415-0410-9bf9-f77b7e298cf2
* Another round of subtitle code cleanupreimar2007-02-051-6/+33
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22155 b3059339-0415-0410-9bf9-f77b7e298cf2
* filename double-conversion, especially usefull for CJK users :-)gpoirier2007-01-261-12/+24
| | | | | | | | | Patch by Zuxy Meng <zuxy.meng@gmail.com> date: Oct 25, 2006 2:20 AM subject: [MPlayer-dev-eng] [PATCH] Filename double-conversion git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22020 b3059339-0415-0410-9bf9-f77b7e298cf2
* print_version() and others get executed before the command line has been ↵michael2007-01-171-0/+4
| | | | | | parsed so -really-quiet does not silence them even though it should according to the verbosity level set by it, this simple change/hack fixes it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21948 b3059339-0415-0410-9bf9-f77b7e298cf2
* DO NOT recommend or even suggest installing codecs.conf.diego2007-01-131-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21906 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle handling cleanup: factor out code for parsing embedded subtitlesreimar2007-01-061-3/+21
| | | | | | | and adding and removing of lines in subtitle struct into subreader.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21845 b3059339-0415-0410-9bf9-f77b7e298cf2
* restore volume if muted at exitben2007-01-041-5/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21820 b3059339-0415-0410-9bf9-f77b7e298cf2
* avoid code duplication.vayne2006-12-281-27/+30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21780 b3059339-0415-0410-9bf9-f77b7e298cf2
* show audio language in osd when playing dvdnav streamsnicodvb2006-12-141-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21620 b3059339-0415-0410-9bf9-f77b7e298cf2
* call dvd_lang_from_aid() only if stream_type is DVDnicodvb2006-12-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21618 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for -alang in dvdnavnicodvb2006-12-141-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21617 b3059339-0415-0410-9bf9-f77b7e298cf2
* check that stream_type is DVD before calling dvd_lang_from_aidnicodvb2006-12-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21578 b3059339-0415-0410-9bf9-f77b7e298cf2
* show subtitle language in OSD ; patch by Otvos Attilanicodvb2006-12-101-0/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21577 b3059339-0415-0410-9bf9-f77b7e298cf2
* use dvdnav's palette if availablenicodvb2006-12-091-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21555 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make MPlayer/MEncoder print the compile-time configuration in verbose mode.diego2006-11-281-0/+3
| | | | | | | based on a patch by Brian Murray, brian game-sat com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21358 b3059339-0415-0410-9bf9-f77b7e298cf2
* keep nav highlight event in dvdnav priv structureben2006-11-251-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21235 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for -slang and subtitles in dvdnav; patch by Attila Otvos (oattila ↵nicodvb2006-11-251-4/+30
| | | | | | chello hu) and me. No palette yet git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21219 b3059339-0415-0410-9bf9-f77b7e298cf2
* better nav highlight handlingben2006-11-251-2/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21216 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for dvdnav menu buttons overlay as simple alpha boxes (rework from ↵ben2006-11-251-0/+9
| | | | | | Otvos Attila's series of patches) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21209 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make compilation depending on USE_OSD unconditional.uau2006-11-221-22/+3
| | | | | | | | | USE_OSD was hardcoded to true in configure, manually turning it off would break compilation, and most OSD-related code wasn't affected by it anyway so it did nothing useful. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21177 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make compilation depending on USE_SUB unconditional.uau2006-11-211-47/+3
| | | | | | | | | | USE_SUB was hardcoded to true in configure, manually turning it off would break compilation, and there's no apparent reason why having all subtitle code under #ifdefs (even working ones) would be worth the clutter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21156 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reuse init_vo_spudec in subtitle switching code.reimar2006-11-211-24/+7
| | | | | | | | | Also generalize vobsub and ass init code to work for demuxers besides matroska (fixes subtitle switching with http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21136 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move vo_spudec initialization into a separate function, for later reusereimar2006-11-211-40/+46
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21135 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move pause loop into a separate function.uau2006-11-201-58/+67
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21098 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reorganize code to move more things out of main().uau2006-11-201-87/+92
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21093 b3059339-0415-0410-9bf9-f77b7e298cf2
* in mp_property_{video,audio} permit uniniting of the corresponding chainnicodvb2006-11-191-6/+8
| | | | | | | by setting *arg to -2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21084 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous demuxer->type==DEMUXER_TYPE_MATROSKA check,reimar2006-11-191-2/+1
| | | | | | | d_dvdsub->id >= 0 is enough in for this case, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21077 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix printf format/argument count mismatch in mp_property_videouau2006-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21073 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move subtitle updating to a separate function, fix inverted conditionuau2006-11-191-64/+73
| | | | | | | | which caused timing of DVD subtitles to be ignored so that they were shown as soon as they were demuxed rather than in their timed position. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21071 b3059339-0415-0410-9bf9-f77b7e298cf2
* new slave command: radio_step_freqvoroshil2006-11-191-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21058 b3059339-0415-0410-9bf9-f77b7e298cf2
* Generalize subtitle switching, demux_ogg does not need a special casereimar2006-11-191-13/+19
| | | | | | | anymore and demux_mov works now, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure sh_video == NULL when reinit_video_chain fails.reimar2006-11-191-4/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21047 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not just skip a file when vo init fails, instead try to play itreimar2006-11-191-1/+0
| | | | | | | as audio-only first. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21046 b3059339-0415-0410-9bf9-f77b7e298cf2
* switch_audio and switch_video properties should be in the range ↵nicodvb2006-11-181-2/+2
| | | | | | -2..MAX_x_STREAMS-1 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21036 b3059339-0415-0410-9bf9-f77b7e298cf2
* When changing playback speed write the current speed to OSD only afteruau2006-11-181-3/+3
| | | | | | | | | build_afilter_chain() which can alter the value. (Though I'm not sure whether the current limits in build_afilter_chain are necessary or correct.) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21028 b3059339-0415-0410-9bf9-f77b7e298cf2
* switch_program property to switch to/set a new programnicodvb2006-11-181-0/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21023 b3059339-0415-0410-9bf9-f77b7e298cf2
* more mp_property_deinterlace simplification, patch byreimar2006-11-181-2/+4
| | | | | | | Carl Eugen Hoyos [cehoyos -at- rainbow studorg tuwien ac at] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21018 b3059339-0415-0410-9bf9-f77b7e298cf2
* implemented M_PROPERTY_SET in mp_property_{audio,video}nicodvb2006-11-181-4/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21016 b3059339-0415-0410-9bf9-f77b7e298cf2
* reinit_video_chain might set sh_video = NULL, so check against that.reimar2006-11-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21014 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark some functions staticuau2006-11-181-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21002 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support palette for general vobsubreimar2006-11-171-1/