summaryrefslogtreecommitdiffstats
path: root/mplayer.c
Commit message (Collapse)AuthorAgeFilesLines
* 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/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20994 b3059339-0415-0410-9bf9-f77b7e298cf2
* consistently use M_PROPERTY_ERROR/M_PROPERTY_OK as return values.reimar2006-11-171-68/+65
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20991 b3059339-0415-0410-9bf9-f77b7e298cf2
* Minor mp_property_deinterlace simplificationreimar2006-11-171-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20990 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add deinterlace property, patch by Carl Eugen Hoyosreimar2006-11-171-0/+25
| | | | | | | | (cehoyos [at] rainbow studorg tuwien ac at) with small modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20989 b3059339-0415-0410-9bf9-f77b7e298cf2
* handle video stream switch using 'switch_video' property'nicodvb2006-11-161-0/+48
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20965 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved video codec/filters/outdevice initialization code to specific functionnicodvb2006-11-161-87/+100
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20963 b3059339-0415-0410-9bf9-f77b7e298cf2
* Introduce step_property command.reimar2006-11-141-0/+7
| | | | | | | Patch by Carl Eugen Hoyos [cehoyos <at> ag or at] with modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20931 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix Unkown -> Unknown typoreimar2006-11-141-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20930 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use vf control for reading pts from vf_vouau2006-11-141-5/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20922 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix statement-before-declaration warnings.reimar2006-11-141-3/+5
| | | | | | | Having a look at the gcc output before committing is a good idea btw. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20920 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove write-only variableuau2006-11-141-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20919 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update OSD contents only after the correct values for the frame are known.uau2006-11-141-6/+13
| | | | | | | | | | | The most visible inaccuracy caused by the previous update location was that the OSD always showed position 0 after seeking with demux_mkv. Split frame decoding and filtering because with -correct-pts the pts value that should be displayed for the frame is only known after decoding but is needed before filtering (during which the OSD is drawn). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20918 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move xscreensaver_heartbeat call next to vo check_eventsuau2006-11-141-8/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20916 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace sleep time calculation in main() with a separate function.uau2006-11-141-86/+60
| | | | | | | | | | Fixes some problems with playback_speed!=1: sleep limits which were supposed to be real time were calculated in scaled time, timing inaccuracies in nosound mode affected next frame by err*(1-1/playback_speed), auto quality code used scaled time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20915 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplifyuau2006-11-141-8/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20914 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move -frames check out of frame flip code (like -endpos earlier)uau2006-11-141-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20913 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unused code.uau2006-11-141-15/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20912 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move endpos handling from page flip code to a saner location, change < to <=uau2006-11-141-5/+5
| | | | | | | | If the shown frame was already at exactly the end pos we don't want to show one more frame after it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20911 b3059339-0415-0410-9bf9-f77b7e298cf2
* move vo event check together with gui event checkuau2006-11-141-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20910 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some incorrect codeuau2006-11-141-8/+1
| | | | | | | | | | | This code was apparently intended to duplicate frames in constant- framerate output in case of skipped input frames, but the test used (blit_frame not set at that location) is not correct for that use. If removing this code turns out to make the brokenness of other code more apparent then a better fix might be needed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20908 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try filling audio buffers more if they're very large, add some comments.uau2006-11-141-8/+19
| | | | | | | | Larger buffers could make sense with lots of high-bitrate audio channels. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20906 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move audio playing code from main() into a separate function.uau2006-11-141-62/+78
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20905 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless check.uau2006-11-141-1/+1
| | | | | | | sh_video should always be non-NULL if this code is run. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20904 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split some from main() into separate functions.uau2006-11-141-103/+116
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20903 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change value used to indicate "unknown audio format" from 0 to -1.uau2006-11-081-1/+1
| | | | | | | 0 collided with a valid format value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20787 b3059339-0415-0410-9bf9-f77b7e298cf2
* now the OSD shows the value returned by demuxer_get_current_time() rather ↵nicodvb2006-11-071-1/+1
| | | | | | than sh_video->pts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20766 b3059339-0415-0410-9bf9-f77b7e298cf2
* ARCH_X86 simplificationsreimar2006-11-011-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move ass_library initialization code to ass_mp.c.eugeni2006-10-291-8/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always initialize and destroy ass_library.eugeni2006-10-291-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20499 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always initialize libass to fix crashes caused by use without initialization.uau2006-10-291-1/+1
| | | | | | | | | | | | Library init was only done if ass_enabled was true at program startup. However there are at least 2 ways how MPlayer can later try to access the library even if ass_enabled is false at that point: - per-file options can turn on ass support later - if the embeddedfonts option is enabled and the file has fonts demux_mkv will call ass_process_font git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20498 b3059339-0415-0410-9bf9-f77b7e298cf2
* Libass interface reworked:eugeni2006-10-281-3/+24
| | | | | | | | | - ass_instance_t renamed to ass_renderer_t - ass_library_t introduced - use of mplayer-specific global variables limited to ass_mp.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not forget to clear subtitles when switching files for embedded subtitles.reimar2006-10-211-1/+1
| | | | | | | Fixes bug #409. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20347 b3059339-0415-0410-9bf9-f77b7e298cf2
* applied patch for -endpos, to work without a blit_frame, pointed out by ↵ptt2006-10-211-4/+5
| | | | | | Andrew Savchenko git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20329 b3059339-0415-0410-9bf9-f77b7e298cf2
* Disable loading of file-specific configuration file from the same rtogni2006-10-151-1/+2
| | | | | | | | directory as the played file. Add a command-line switch to enable it. Patch by reimar, manpage patch by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20257 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused ABS definereimar2006-10-141-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20213 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, used MSGTR_Unknown instead of lang in mp_property_audioreimar2006-10-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20188 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplify mp_property_subreimar2006-10-121-6/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20187 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics for previous mplayer.c patchreimar2006-10-121-13/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20185 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify mp_property_audioreimar2006-10-121-12/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20184 b3059339-0415-0410-9bf9-f77b7e298cf2
* modifications pointed out by reimar doffingerptt2006-10-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20174 b3059339-0415-0410-9bf9-f77b7e298cf2
* added OSD audio switching visualizationptt2006-10-111-15/+69
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20162 b3059339-0415-0410-9bf9-f77b7e298cf2
* after a long time, finally i could add -endpos option to mplayer executable.ptt2006-09-251-3/+24
| | | | | | | | as oded told me on 1006 02 24, i applied it, blame me if some problem occurs, i hope not, since i tried it for a while.... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19979 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the sound mute switch in the GUI menu by moving the correspondingdiego2006-09-231-11/+10
| | | | | | | | piece of GUI code after audio initialization. patch by Stanislav Maslovski, stanislav.maslovski gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19952 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix audio stream switching with demux_mkv:reimar2006-09-231-2/+2
| | | | | | | | return value of demuxer_switch_audio is new stream number for -aid, the index in a_streams array is in demuxer->audio->id instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19951 b3059339-0415-0410-9bf9-f77b7e298cf2
* when changing chapter, in the osd print the channel number in a more natural ↵nicodvb2006-09-231-1/+1
| | | | | | | | | form: 1-based (rather than 0-based) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19949 b3059339-0415-0410-9bf9-f77b7e298cf2
* show in the osd the number of the button selected by the mousenicodvb2006-09-191-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19916 b3059339-0415-0410-9bf9-f77b7e298cf2
* Іnitial button value is -1. Only (button>0) is a correct button selection.jonas2006-09-191-3/+3
| | | | | | | | Initialized "dvdnav_status_t status" explicitly for clarity. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19914 b3059339-0415-0410-9bf9-f77b7e298cf2
* report mouse coordinates after movement to dvdnav; this permits to enable ↵nicodvb2006-09-161-0/