summaryrefslogtreecommitdiffstats
path: root/mplayer.c
Commit message (Collapse)AuthorAgeFilesLines
* cosmetics: Decrapify the indentation of the last few blocks of main().diego2008-03-071-68/+65
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26191 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move duplicated extern declarations of mp_msg_levels and mp_msg_level_alldiego2008-03-041-3/+0
| | | | | | | to cfg-common.h where they are really needed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26162 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add ID_SEEKABLE information to -identify output.diego2008-03-031-0/+1
| | | | | | | patch by Mathieu SCHROETER, mathieu.schroeter gamesover ch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26144 b3059339-0415-0410-9bf9-f77b7e298cf2
* Select audio stream in mplayer and mencoder, overriding demuxer decision.eugeni2008-02-291-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26122 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer-independent subtitle track selection.eugeni2008-02-291-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26119 b3059339-0415-0410-9bf9-f77b7e298cf2
* Attempt to fix -chapter broken for mkv in r25987reimar2008-02-281-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26113 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix continuous scrolling on OS/2 due to status line updates unless -quietdiego2008-02-221-1/+1
| | | | | | | | | option is specified. The problem is similar on Windows, so share the same workaround for both systems. patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26059 b3059339-0415-0410-9bf9-f77b7e298cf2
* OS/2 getch2() supportdiego2008-02-211-5/+1
| | | | | | | patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26048 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename mp_input_win32_slave_cmd_func to mp_input_slave_cmd_func.diego2008-02-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26047 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefs around extern declarations.diego2008-02-201-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change force_fps and force_ofps to doublereimar2008-02-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25997 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-141-49/+49
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* -chapter is now handled uniformly calling demuxer_seek_chapter() insteadnicodvb2008-02-111-0/+12
| | | | | | | of letting individual demuxers and stream readers do their nasty job git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25987 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not reset correct_pts in mp_dvdnav_reset_stream, it does not seem necessaryreimar2008-02-031-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25952 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_functions_t should be const, part 1reimar2008-02-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25945 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use defines to give names to the different seek flags.reimar2008-01-291-4/+4
| | | | | | | | A better solution should be considered later, esp. for the many broken demuxers that do not treat these flags correctly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure sub_font is freed.reimar2008-01-271-0/+2
| | | | | | | Patch by Guillaume LECERF (foxcore gmail com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25880 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support vobsub palette in extradata, as exported by libavformatreimar2008-01-261-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25872 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for stream change in dvdnav.ben2008-01-261-0/+8
| | | | | | | | Set new aspect ratio if needed (for example in cell change) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25859 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for dvdnav still frames playback.ben2008-01-261-1/+170
| | | | | | | | | | | Based on various patches from Otvos Attila and MPlayer'ized by me. N.B. Always use -vc ffmpeg12 with dvdnav:// git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25852 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix auto-sub code to support filenames with any extension length.ulion2008-01-201-4/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25818 b3059339-0415-0410-9bf9-f77b7e298cf2
* audio_out / video_out structs should be treated as constreimar2008-01-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25793 b3059339-0415-0410-9bf9-f77b7e298cf2
* Instead of keeping attachments in mkv demuxer, use demuxer_add_attachment().eugeni2008-01-121-0/+13
| | | | | | | These attachments are passed to libass after demuxer is opened. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25686 b3059339-0415-0410-9bf9-f77b7e298cf2
* allow profile loading per audio/video outputben2008-01-101-0/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25669 b3059339-0415-0410-9bf9-f77b7e298cf2
* factorizes variable checkben2008-01-101-3/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25664 b3059339-0415-0410-9bf9-f77b7e298cf2
* add support for per protocol and per extension playback profile loadingben2008-01-101-0/+48
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25663 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use getppid instead of getpid and move a snprintf to where it is actually ↵reimar2008-01-081-2/+2
| | | | | | needed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25653 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify a needlessly complex use of snprintfreimar2008-01-081-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25652 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use exit_player in the signal handler, this code just can notreimar2008-01-081-2/+4
| | | | | | | | | be called from a signal handler. Instead only make the input system generate quit commands for the first CTRL+C and otherwise do getch2_disable and exit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25651 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clear fonts when the file is closed.eugeni2008-01-081-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25650 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add heartbeat-cmd optionreimar2008-01-071-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25639 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make some functions in mplayer.c staticreimar2008-01-061-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25634 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless #ifdefsreimar2007-12-221-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25495 b3059339-0415-0410-9bf9-f77b7e298cf2
* OSD menu support mouse selection.ulion2007-12-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25489 b3059339-0415-0410-9bf9-f77b7e298cf2
* Ignore mouse pos command when pausing.ulion2007-12-191-1/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25464 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make libmenu init and uninit in proper place.ulion2007-12-191-3/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25461 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not operate on vobsub when no video (Bug #312).ulion2007-12-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25444 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace some more broken SYS_DARWIN preprocessor conditionals with __APPLE__.diego2007-12-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25425 b3059339-0415-0410-9bf9-f77b7e298cf2
* dvb cleanup: call dvb_(set|step)_channel() without dereferencing ↵nicodvb2007-12-151-6/+2
| | | | | | stream->priv (1000l to me) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25405 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support chapter in OSD menu.ulion2007-12-141-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25392 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix libass to support -nofontconfig.ulion2007-12-121-1/+1
| | | | | | | | For history reason, fontconfig is auto-enabled when ass is enabled, we keep this behavior and document it clearly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25379 b3059339-0415-0410-9bf9-f77b7e298cf2
* When auto loading subs, log warning instead of error for load failure.ulion2007-12-041-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25292 b3059339-0415-0410-9bf9-f77b7e298cf2
* Skip empty vobsub streams when selecting subtitles.ulion2007-12-031-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25279 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove the pause filter and the cmd queue hack, to know the mplayer going toulion2007-11-151-0/+5
| | | | | | | | pause by checking mpctx directly. If there's any video update before the pause then capture the frame or fallback to use last captured frame as pausing frame. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25054 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make crash-debug gdb auto-execute "bt"reimar2007-11-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25010 b3059339-0415-0410-9bf9-f77b7e298cf2
* Restore terminal for gdb with -crash-debug by calling getch2_disable()reimar2007-11-101-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25009 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix memory leak caused by after calling mp_input_get_cmd didn't free the cmd.ulion2007-11-061-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24975 b3059339-0415-0410-9bf9-f77b7e298cf2
* Old code for dvdsub_id fix assume the global_sub_indices[SUB_SOURCE_DEMUX]ulion2007-11-041-1/+3
| | | | | | | | must be zero when use a dvdsub_id greater than max sub id from demux. To remove the implicit assumption, make it up here. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24962 b3059339-0415-0410-9bf9-f77b7e298cf2
* We support gcc 2.95 (fixes r24928).cehoyos2007-11-021-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24941 b3059339-0415-0410-9bf9-f77b7e298cf2
* A/V sync: take audio filter buffers into accountuau2007-11-011-1/+8
| | | | | | | | | | | | | | | | | | Substract the delay caused by filter buffering when calculating currently playing audio position. This matters for af_scaletempo which buffers significant and varying amounts of data. For other current filters the effect is normally insignificant. Instead of the old time-based filter delay field (which was ignored) this version stores the per-filter delay in units of bytes input read without corresponding output. This allows the current scaletempo behavior where other filters before and after it can see the same nominal samplerate even though the real duration of the data varies; in this case the other filters can not know the delay they're causing in terms of real time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24928 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add audio filter scaletempouau2007-11-011-8/+14
| | | | | | | Patch by Robert Juliano, juliano.1 osu edu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24924 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make output samplerate independent of -speeduau2007-11-011-1/+1
| | | | | | | | | | | | | | | | | The samplerate requested from the audio out depended on the initial value of playback speed on startup. Changing speed later at runtime does not affect output samplerate; audio is always resampled instead. Change the init code so that speed does not affect the samplerate requested and behavior matches what you'd get by starting the file with speed 1 and then changing it. The previous behavior could be desirable when using a constant speed value. However it means that if you start with a low speed and later switch to normal speed then audio will be resampled to a low output frequency. You can still use -srate to explicitly select the frequency. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24923 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify init_audio_filters() argumentsuau2007-11-011-5/+2
| | | | | | | | | | | | | | | Remove the following arguments as redundant: in_channels, in_format, out_minsize, out_maxsize. The first two always equal fields of the sh_audio_t struct given as the first argument to the function. The last two are unused after the allocation of sh_audio->a_out_buffer was changed to be done on demand. After the out_minsize and out_maxsize arguments are removed the function preinit_audio_filters() is identical to init_audio_filters(), so remove it and use the latter instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24922 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change decode_audio() interfaceuau2007-11-011-15/+5
| | | | | | | | | | | | Rewrite decode_audio to better deal with filters that handle input in large blocks. It now always places output in sh_audio->a_out_buffer (which was always given as a parameter before) and reallocates the buffer if needed. After the changes filters can return arbitrarily large blocks of data without some of it being lost. The new version also allows simplifying some code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24920 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up some fields in stheader.h structsuau2007-11-011-1/+0
| | | | | | | | | | | | | | sh_video_t: void *video_out: only assigned to, never read. Remove. sh_video_t: void *vfilter: change type to struct vf_instance_s * sh_audio_t: void *afilter: change type to struct af_stream_s * The latter two never hold different types so there's no reason to use void *. Maybe they were originally defined that way because the option of using pointers to incomplete struct types was missed (the typedefs vf_instance_t and af_stream_t would require extra headers)? git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24919 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not reset user-enabled mute on EOF, but only on exit.reimar2007-09-031-1/+2
| | | | | | | Make behaviour more consistent with general volume control. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24337 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved to reinit_video_chain() the assignment of sh_video->stream_aspect, ↵nicodvb2007-09-011-3/+3
| | | | | | where it makes more sense git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24322 b3059339-0415-0410-9bf9-f77b7e298cf2
* if the stream reader supports it assign to the video the stream aspect rationicodvb2007-09-011-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24320 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up the way get_path is handled: Compile get_path.c to an object to linkdiego2007-08-281-1/+1
| | | | | | | | against instead of directly #including the C file and replace the many extern declarations by a proper header file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix warnings:diego2007-08-251-6/+0
| | | | | | | | | | | | mplayer.c:316: warning: redundant redeclaration of 'vo_subdevice' libvo/video_out.h:237: warning: previous declaration of 'vo_subdevice' was here mplayer.c:317: warning: redundant redeclaration of 'ao_subdevice' libao2/audio_out.h:44: warning: previous declaration of 'ao_subdevice' was here mplayer.c:320: warning: redundant redeclaration of 'vo_flags' libvo/video_out.h:189: warning: previous declaration of 'vo_flags' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24184 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add separate event input type for terminal+vouau2007-08-251-1/+1
| | | | | | | | | | | Add an input/input.c fd type whose read function takes no arguments and returns no value. If such a function reads key or command events it'll add them to the queues itself. Use this type for terminal input which was special-cased before. The event function for X11-based VOs will use the same type later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24152 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary OSD visibility codeuau2007-08-211-2/+0
| | | | | | | | | | | | | | Don't set osd_visible directly in seek code. It's usually set to the same value by set_osd_bar() already. In the cases where set_osd_bar() is not called or doesn't set it (seek is triggered by EDL or loop, or there is no video output) it seems to make no difference. This fixes a minor bug: if you set OSD level to disabled while the progress bar was visible then doing seeks before it disappeared would keep it visible but not change its value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24112 b3059339-0415-0410-9bf9-f77b7e298cf2
* Minor code cleanupuau2007-08-211-13/+13
| | | | | | | | Move timed hiding of OSD progress bar to the same place where OSD messages are timed out. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24111 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove an unnecessary #ifdefuau2007-08-181-10/+0
| | | | | | | | | The default version of the sleep timer no longer has the code which required adding a different #ifdef SYS_DARWIN version, so remove the Darwin implementation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24090 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless #ifdefuau2007-08-151-4/+0
| | | | | | | | | No need to mark stdin non-select()able in the mp_input_add_key_fd call when no HAVE_POSIX_SELECT; input.c won't use select() on anything if that is not defined. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24061 b3059339-0415-0410-9bf9-f77b7e298cf2
* mixer.afilter must be set to NULL when filter chain is destroyed on uninit.reimar2007-07-311-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23972 b3059339-0415-0410-9bf9-f77b7e298cf2
* Teletext supportvoroshil2007-07-291-0/+3
| | | | | | | | Part 4/5: teletext page rendering git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23923 b3059339-0415-0410-9bf9-f77b7e298cf2
* Removing global variables from tv://voroshil2007-07-291-1/+1
| | | | | | | | | Step 8 (last): removing old globals from tv.c, tv.h, fixing remaining references in cfg-common.h and mplayer.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23909 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of a few more useless malloc castsreimar2007-07-191-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23828 b3059339-0415-0410-9bf9-f77b7e298cf2