summaryrefslogtreecommitdiffstats
path: root/mpcommon.c
Commit message (Collapse)AuthorAgeFilesLines
* Replace a bunch of '#if HAVE_FOO' preprocessor checks by 'if (HAVE_FOO)'.diego2009-01-261-16/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28375 b3059339-0415-0410-9bf9-f77b7e298cf2
* HAVE_3DNOW --> HAVE_AMD3DNOWdiego2009-01-261-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add SSSE3 and CMOV to CPU information printed on startup.diego2009-01-251-2/+8
| | | | | | | Fixes Bugzilla #1378. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28366 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Consistently name 3DNow! extensions.diego2009-01-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28365 b3059339-0415-0410-9bf9-f77b7e298cf2
* HAVE_3DNOWEX --> HAVE_3DNOWEXTdiego2009-01-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28361 b3059339-0415-0410-9bf9-f77b7e298cf2
* Factorize print_version().diego2009-01-251-0/+45
| | | | | | | Print CPU information in verbose mode instead of by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28360 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert bad changes to SSA/ASS subtitle packet formatuau2008-09-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commits are reverted partially or completely: "a valid ASS line contains 9 ',' before actual text" "demux_mkv: output correctly formated ASS packets" "libass: add a new ass_process_data() to process demuxed subtitle packets" These commits converted the internal representation of SSA/ASS subtitle packets from the format used by Matroska to a custom format where each packet has contents exactly matching one line in complete SSA script files. AFAIK no files natively use such a format for muxed subtitles. The stated reason for this change was to use a format that could in principle be muxed into a maximal number of containers. SSA subtitles do not have an implicit duration so both start time and duration or end time need to be specified explicitly; the new format moved timing information inside the codec packet data so it could be muxed without modification into containers that can represent only start time at the container level. However such a change is wrong from the viewpoint of program architecture. Timing information belongs to the demuxer level, but these commits moved not only the duration but also the authoritative value of the start time to inside the codec data. Additionally the new format lost the value of the Matroska ReadOrder field which is used by MPlayer. This commit changes the internal packet format back to that used by Matroska and makes the internal Matroska demuxer output that format again. Libavformat still outputs the "new" format; it could be converted back to the Matroska format in demux_lavf.c, but I'm not adding that code at least yet. The current lavf code has similar problems as the reverted code in MPlayer, and it also currently fails to provide any way to access the value of the ReadOrder field. I hope that the lavf side will be improved; if it isn't conversion can be added later. For now I'll make MPlayer default to the internal Matroska demuxer instead of the lavf one in a separate commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27550 b3059339-0415-0410-9bf9-f77b7e298cf2
* libass: add a new ass_process_data() to process demuxed subtitle packetsaurel2008-09-051-3/+1
| | | | | | | conforming to the ASS spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27530 b3059339-0415-0410-9bf9-f77b7e298cf2
* a valid ASS line contains 9 ',' before actual textaurel2008-09-041-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27526 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-2/+2
| | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename two GUI-related preprocessor directives:diego2008-07-301-6/+6
| | | | | | | HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-2/+2
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* noconfig fix, disable_gui_conf was not defined when compiling mencoder.albeu2008-04-151-1/+3
| | | | | | | | Fix mencoder linking when the GUI is enabled. Patch by Norman Yarvin (yarvin -at- yarchive -dot- net). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26454 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add options to disable some or all config files.albeu2008-04-141-0/+26
| | | | | | | Patch by Andrew Savchenko (Bircoph -at- list -dot- ru). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26448 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support 'default' attribute for audio and subtitle tracks.eugeni2008-03-301-0/+2
| | | | | | | | | The first default track is chosen for playback if language-based selection failes. Additionally, for audio tracks, the first one is chosen if there are no default tracks at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26301 b3059339-0415-0410-9bf9-f77b7e298cf2
* Select audio stream in mplayer and mencoder, overriding demuxer decision.eugeni2008-02-291-0/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26122 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reindentreimar2008-01-271-10/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25885 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify subtitle handling with -assreimar2008-01-271-8/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25884 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support mov subtitle format directly instead of converting to text in the ↵reimar2008-01-271-2/+8
| | | | | | demuxer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25883 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove global_ass_track. Instead create an ass_track for each 't' track.eugeni2008-01-111-4/+3
| | | | | | | | Global_ass_track obviously can not work when there is more than one 't tracks, their lines will be mixed up. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25684 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move all subtitle parsing from mkv demuxer to update_subtitles().eugeni2008-01-111-8/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25683 b3059339-0415-0410-9bf9-f77b7e298cf2
* Whitespace-only cosmetics: get rid of tabsreimar2008-01-061-94/+94
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25632 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix update_subtitles() checking subtitle type for the wrong track.eugeni2007-12-281-2/+3
| | | | | | | | | | update_subtitles() uses 'type' field from d_dvdsub even when some other track is active. For this reason, external vobsub is not displayed when there is at least one text track from demuxer (type is always 't' or 'a' in this case). The solution is to check vobsub_id and dvdsub_id instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25537 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix spudec to display current vobsub immediately after a seek.ulion2007-12-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25350 b3059339-0415-0410-9bf9-f77b7e298cf2
* Decrease teletext page rendering frequency from 1/frame to about 4/sec.voroshil2007-09-081-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24362 b3059339-0415-0410-9bf9-f77b7e298cf2
* Teletext supportvoroshil2007-07-291-0/+21
| | | | | | | | Part 4/5: teletext page rendering git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23923 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r23530.voroshil2007-06-211-31/+0
| | | | | | | | | r23530 breaks policy: notification was not sent to mailing list, agreements of other devs were not received. Code also should be reviewed/cleaned up/fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23593 b3059339-0415-0410-9bf9-f77b7e298cf2
* Teletext support for tv:// (v4l and v4l2 only)voroshil2007-06-101-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified patch from Otvos Attila oattila at chello dot hu Module uses zvbi library for all low-level VBI operations (like I/O with vbi device, converting vbi pages into usefull vbi_page stuctures, rendering them into RGB32 images). All teletext related stuff (except properties, slave commands and rendering osd in text mode or RGB32 rendered teletext pages in spu mode) is implemented in tvi_vbi.c New properties: teletext_page - switching between pages teletext_mode - switch between on/off/opaque/transparent modes teletext_format - (currently read-only) allows to get format info (black/white,gray,text) teletext_half_page - trivial zooming (displaying top/bottom half of teletext page) New slave commands: teletext_add_dec - user interface for jumping to any page by editing page number interactively teletext_go_link - goes though links, specified on current page git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23530 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move some subtitle handling from mplayer.c to mpcommon.c and share it with ↵reimar2007-02-171-0/+140
mencoder.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22251 b3059339-0415-0410-9bf9-f77b7e298cf2