summaryrefslogtreecommitdiffstats
path: root/mplayer.c
Commit message (Collapse)AuthorAgeFilesLines
* Unconditionally compile Matroska demuxer - oops, part missed in initial commit.diego2006-05-091-10/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18407 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't blit frame if we hit EOF and no new frame is read. Fixes pictureuau2006-05-051-0/+1
| | | | | | | | | changing back to a previous frame after the last one with some vos. Patch by Timothy Lee, timothy (.) lee () siriushk com [location of the added line changed by me]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18390 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove a useless variable.uau2006-04-271-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18324 b3059339-0415-0410-9bf9-f77b7e298cf2
* spelling/grammar/wording fixes in doxygen and non-doxygen commentsdiego2006-04-271-57/+61
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18317 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless "#if 0" blocksuau2006-04-271-29/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18316 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make EDL compilation unconditionaluau2006-04-271-24/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change common pts variables from floats to doubles. Individual demuxersuau2006-04-271-3/+3
| | | | | | | should be changed later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18310 b3059339-0415-0410-9bf9-f77b7e298cf2
* The code setting the OSD seek direction indicator for absolute seeks wasuau2006-04-251-2/+2
| | | | | | | | nonsense. Fix the to-timestamp case. I don't care enough to fix the to-percentage case so just add a comment noting it's broken. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18289 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove updating of vo_mouse_timer_const from the main loop and alsouau2006-04-251-10/+8
| | | | | | | | remove the variable itself. Convert code in x11_common.c and OSD timing that depended on the variable to use real time instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18288 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplified management of dvb channel switchingnicodvb2006-04-251-15/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18287 b3059339-0415-0410-9bf9-f77b7e298cf2
* Doxygen attack! - Chapter 2albeu2006-04-241-19/+111
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18262 b3059339-0415-0410-9bf9-f77b7e298cf2
* 5 - Drop more buffered audio data left from old position when seeking.rtognimp2006-04-241-0/+2
| | | | | | | Patch by Uoti Urpala git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18244 b3059339-0415-0410-9bf9-f77b7e298cf2
* 4 - Implement a better way to calculate current audio pts and use it forrtognimp2006-04-241-10/+10
| | | | | | | | | audio decoded with ad_libvorbis, ad_ffmpeg and ad_faad. Patch by Uoti Urpala git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18243 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1 - Remove kernel HZ=100 assumptions that are no longer true fromrtognimp2006-04-241-8/+7
| | | | | | | | | timing. Patch by Uoti Urpala git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18241 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get ride of the several if(identify) messy lines and rearangment of some of ↵reynaldo2006-04-241-36/+25
| | | | | | the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove support for default.sub.diego2006-04-231-8/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18233 b3059339-0415-0410-9bf9-f77b7e298cf2
* Kill an unused variable warning.diego2006-04-231-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18232 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add properties to get/set the stream position and get the streamalbeu2006-04-231-0/+53
| | | | | | | start pos, end pos and length. Based on Reimar's patch. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18227 b3059339-0415-0410-9bf9-f77b7e298cf2
* Align osd_show_text with osd_show_property_text.albeu2006-04-231-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18224 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a new command: osd_show_property_text that show an expanded propertyalbeu2006-04-231-0/+10
| | | | | | | | string on the OSD. Based on a patch 'by someone named "veal" on irc' that showed the filename. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18223 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle the tv color control commands with the properties.albeu2006-04-221-17/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18207 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add properties for the tv input color controls.albeu2006-04-221-6/+66
| | | | | | | | Make the "normal" color controls fallback on the tv ones if not available from vf/vo. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18191 b3059339-0415-0410-9bf9-f77b7e298cf2
* add a newline before the "Playing"... linereimar2006-04-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18152 b3059339-0415-0410-9bf9-f77b7e298cf2
* Include buffered decoded audio in A-V sync calculations.corey2006-04-171-3/+2
| | | | | | | Patch by Uoti Urpala, uoti<<dot>>urpala<<at>>pp1<<dot>>inet<<dot>>fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18130 b3059339-0415-0410-9bf9-f77b7e298cf2
* do not try to load default.sub when it doesn't exist. Fixes bug #480.reimar2006-04-151-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18100 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix A-V sync overcorrection for desync due to too slow hardware.reimar2006-04-141-1/+7
| | | | | | | Patch by Uoti Urpala ( uoti urpala at pp1 inet fi ) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18089 b3059339-0415-0410-9bf9-f77b7e298cf2
* sh_audio->delay is adjusted in the wrong direction when changing audio_delayreimar2006-04-061-1/+1
| | | | | | | | at runtime (taking esp. long to recover with large -autosync). Patch by Uoti Urpala [uoti urpala at pp1 inet fi] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18048 b3059339-0415-0410-9bf9-f77b7e298cf2
* more cruftrfelker2006-03-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18004 b3059339-0415-0410-9bf9-f77b7e298cf2
* arrg more of this stupid cruftrfelker2006-03-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18003 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix stepping in the playtree when interupting libmpdemux.albeu2006-03-271-2/+2
| | | | | | | Thanks to Jonas Jermann for the report. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17980 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of 2 osd related hacks.albeu2006-03-241-6/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17939 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitles properties: move sub_select, sub_pos, sub_visibilty,albeu2006-03-241-257/+295
| | | | | | | sub_alignment and sub_forced_only to properties. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17936 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert all if(verbose>X) to mp_msg_test calls.diego2006-03-241-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix osd_show_msg alignment and make sure msg stringsalbeu2006-03-231-2/+4
| | | | | | | | get properly 0 terminated. Thanks to Jonas Jermann (jjermann _At_ gmx _Dot_ net) for the report. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17930 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert fullscreen, panscan, color controls, ontop, rootwin,albeu2006-03-231-191/+212
| | | | | | | | border, framedrop and vsync to properties. Also add a couple of video related properties like width, height, etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17929 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move audio_delay to a property and add a few read only properties toalbeu2006-03-221-8/+62
| | | | | | | query samplerate, format, etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17926 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add an option to list the properties: -list-propertiesalbeu2006-03-221-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17915 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add the new property API and implement a couple properties.albeu2006-03-221-36/+324
| | | | | | | | Move the volume and mute command to the command to property bridge. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17912 b3059339-0415-0410-9bf9-f77b7e298cf2
* feed something (hopefully correct timestamps) into the video filter chainmichael2006-03-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17911 b3059339-0415-0410-9bf9-f77b7e298cf2
* Print the mute state on the OSD.diego2006-03-181-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17892 b3059339-0415-0410-9bf9-f77b7e298cf2
* Enable gui key bindings only when running the gui. Fix enter and escalbeu2006-03-181-1/+1
| | | | | | | not working with a GUI enabled build running w/o GUI. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17891 b3059339-0415-0410-9bf9-f77b7e298cf2
* restored the ability to disable subtitles when cycling with slave command ↵nicodvb2006-03-051-1/+11
| | | | | | 'sub_select' (previously broken in release 1.900) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17733 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't fall back to MP_CMD_TV_LAST_CHANNEL after MP_CMD_DVB_SETCHANNEL; patch ↵nicodvb2006-03-021-0/+1
| | | | | | by calking a ieee d org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17716 b3059339-0415-0410-9bf9-f77b7e298cf2
* New option: -ignore-startcorey2006-02-201-0/+3
| | | | | | | Makes mplayer and mencoder ignore dwStart in AVI files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17655 b3059339-0415-0410-9bf9-f77b7e298cf2
* dwStart support for mplayer.corey2006-02-181-2/+8
| | | | | | | | | | | | | | | | | | | * demux_avi sets stream_delay according to dwStart * mplayer adjusts audio_delay according to stream_delay 3 related patches are pending, and I will apply them over the next few days if all goes well. As I mentioned on -dev-eng, the funny indentation is in preparation for one of those pending patches. See: Date: Fri, 17 Feb 2006 00:53:28 -0800 To: mplayer-dev-eng@mplayerhq.hu Subject: [PATCH] bframes, dwStart: individual patches git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17644 b3059339-0415-0410-9bf9-f77b7e298cf2
* Second-try commit of this patch.corey2006-02-171-1/+1
| | | | | | | | | | | | 1. Include audio_delay as an argument to demux_seek. 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. I've quadruple checked this time; hopefully I haven't missed anything. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reverse commit of unfinished patch for passing audio_delay to the demuxers.corey2006-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. Include audio_delay as an argument to demux_seek.corey2006-02-071-1/+1
| | | | | | | | | | | 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. Other demuxers could be modified similarly in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
* dvd subtitles should be disabled by default, and enabled specifying -sid or ↵nicodvb2006-01-131-1/+2
| | | | | | -slang; this fix also restores the display of other subtitles types when dvd subs are present git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17380 b3059339-0415-0410-9bf9-f77b7e298cf2
* massive attack: mp_msg printf format fixesrathann2006-01-121-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix premature end of audio playback (audio only)henry2006-01-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17342 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update copyright date to 2006gpoirier2006-01-041-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17313 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't reset dvdsub->id unless -slang is specified; assign default sub stream ↵nicodvb2006-01-021-0/+2
| | | | | | id when demux->sub->id is -1 (autodetect) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17287 b3059339-0415-0410-9bf9-f77b7e298cf2
* check the intermediate audio bufferhenry2005-12-311-1/+1
| | | | | | | | otherwise, data can get stuck between the demuxer and filter layer causing a premature end of audio. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17275 b3059339-0415-0410-9bf9-f77b7e298cf2
* change erase to end of line, fall back to old behavior if no termcap foundods152005-12-291-2/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17259 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix erase to end of line with windows, windows terminal does not supportods152005-12-271-1/+1
| | | | | | | control codes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17252 b3059339-0415-0410-9bf9-f77b7e298cf2
* add "pausing_keep" and "pausing_toggle" input cmd prefixesods152005-12-251-2/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17242 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use termcap "erase to end of line" character code instead of using spacesods152005-12-251-3/+2
| | | | | | | to end of screen. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17241 b3059339-0415-0410-9bf9-f77b7e298cf2
* Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'llods152005-12-071-3/+3
| | | | | | | print bogus stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17121 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix EDL to be per file, allow -edlout and -edl together as there is reallyods152005-12-061-20/+15
| | | | | | | no reason not to. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17110 b3059339-0415-0410-9bf9-f77b7e298cf2
* new -msglevel option, constrols msg level for every msg moduleods152005-12-061-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17107 b3059339-0415-0410-9bf9-f77b7e298cf2
* mplayer.c:1928: warning: implicit declaration of function 'cache_uninit'rathann2005-12-051-0/+2
| | | | | | | mplayer.c:2897: warning: implicit declaration of function 'mpcodecs_config_vo' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17089 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a function to remove osd msg and use it to remove the "OSD: enabled"albeu2005-11-271-0/+25
| | | | | | | msg when switching the OSD to a level above 1. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17058 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make the osd command only switch between enabled/disabled whenalbeu2005-11-201-7/+14
| | | | | | | | using the term osd. Also put a define to test for the term osd without #ifdef. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17022 b3059339-0415-0410-9bf9-f77b7e298cf2
* Big OSD cleanup. Replace the mess with 100's of counter varsalbeu2005-11-161-265/+320
| | | | | | | | | with a clean and simple interface. As a bonus osd messages can now be displayed on the console if there is no vo (or osd is disabled in libvo). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16993 b3059339-0415-0410-9bf9-f77b7e298cf2
* add a switch, slave command, and vo control to toggle borderless window.joey2005-11-101-0/+15
| | | | | | | includes documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16969 b3059339-0415-0410-9bf9-f77b7e298cf2
* reordered subtitles language OSD display, since it worked bad for ogm...ptt2005-11-091-36/+37
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16956 b3059339-0415-0410-9bf9-f77b7e298cf2
* there is no sh_video for audio only filesfaust32005-11-061-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16939 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: osd_show_dvd_nav_highlight is just a flagranma2005-11-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16934 b3059339-0415-0410-9bf9-f77b7e298cf2
* Number of frames to show the OSD shouldn't be hardcoded, derive from fps insteadranma2005-11-061-12/+12
| | |