aboutsummaryrefslogtreecommitdiffhomepage
path: root/mplayer.c
Commit message (Collapse)AuthorAge
* Reuse init_vo_spudec in subtitle switching code.Gravatar reimar2006-11-21
| | | | | | | | | 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 reuseGravatar reimar2006-11-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21135 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move pause loop into a separate function.Gravatar uau2006-11-20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21098 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reorganize code to move more things out of main().Gravatar uau2006-11-20
| | | | 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 chainGravatar nicodvb2006-11-19
| | | | | | | 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,Gravatar reimar2006-11-19
| | | | | | | 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_videoGravatar uau2006-11-19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21073 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move subtitle updating to a separate function, fix inverted conditionGravatar uau2006-11-19
| | | | | | | | 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_freqGravatar voroshil2006-11-19
| | | | 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 caseGravatar reimar2006-11-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.Gravatar reimar2006-11-19
| | | | 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 itGravatar reimar2006-11-19
| | | | | | | 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 ↵Gravatar nicodvb2006-11-18
| | | | | | -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 afterGravatar uau2006-11-18
| | | | | | | | | 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 programGravatar nicodvb2006-11-18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21023 b3059339-0415-0410-9bf9-f77b7e298cf2
* more mp_property_deinterlace simplification, patch byGravatar reimar2006-11-18
| | | | | | | 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}Gravatar nicodvb2006-11-18
| | | | 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.Gravatar reimar2006-11-18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21014 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark some functions staticGravatar uau2006-11-18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21002 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support palette for general vobsubGravatar reimar2006-11-17
| | | | 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.Gravatar reimar2006-11-17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20991 b3059339-0415-0410-9bf9-f77b7e298cf2
* Minor mp_property_deinterlace simplificationGravatar reimar2006-11-17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20990 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add deinterlace property, patch by Carl Eugen HoyosGravatar reimar2006-11-17
| | | | | | | | (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'Gravatar nicodvb2006-11-16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20965 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved video codec/filters/outdevice initialization code to specific functionGravatar nicodvb2006-11-16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20963 b3059339-0415-0410-9bf9-f77b7e298cf2
* Introduce step_property command.Gravatar reimar2006-11-14
| | | | | | | 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 typoGravatar reimar2006-11-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20930 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use vf control for reading pts from vf_voGravatar uau2006-11-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20922 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix statement-before-declaration warnings.Gravatar reimar2006-11-14
| | | | | | | 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 variableGravatar uau2006-11-14
| | | | 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.Gravatar uau2006-11-14
| | | | | | | | | | | 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_eventsGravatar uau2006-11-14
| | | | 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.Gravatar uau2006-11-14
| | | | | | | | | | 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
* simplifyGravatar uau2006-11-14
| | | | 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)Gravatar uau2006-11-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20913 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unused code.Gravatar uau2006-11-14
| | | | 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 <=Gravatar uau2006-11-14
| | | | | | | | 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 checkGravatar uau2006-11-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20910 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some incorrect codeGravatar uau2006-11-14
| | | | | | | | | | | 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.Gravatar uau2006-11-14
| | | | | | | | 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.Gravatar uau2006-11-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20905 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless check.Gravatar uau2006-11-14
| | | | | | | 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.Gravatar uau2006-11-14
| | | | 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.Gravatar uau2006-11-08
| | | | | | | 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 ↵Gravatar nicodvb2006-11-07
| | | | | | than sh_video->pts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20766 b3059339-0415-0410-9bf9-f77b7e298cf2
* ARCH_X86 simplificationsGravatar reimar2006-11-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move ass_library initialization code to ass_mp.c.Gravatar eugeni2006-10-29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always initialize and destroy ass_library.Gravatar eugeni2006-10-29
| | | | 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.Gravatar uau2006-10-29
| | | | | | | | | | | | 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:Gravatar eugeni2006-10-28
| | | | | | | | | - 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