Commit Graph

641 Commits

Author SHA1 Message Date
arpi 120f4d12b9 I've made some changes to the -identify handling. As previously the output
for ID_VIDEO_FORMAT was only meaningful if it was a fourcc file, the
output for mpeg1 and mpeg2 was jibberish.
based on patch by Philip Jägenstedt <philipj@telia.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8673 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-31 02:26:32 +00:00
arpi 91b38a8658 This patch fixes so that the exit code (or return code if you like) is set
to zero when mplayer exits because of natural EOF or by the quit command.
This can be useful if you (like me) use mplayer in scripts.
patch by Oskar Liljeblad <oskar@osk.mine.nu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8645 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-29 21:06:20 +00:00
arpi c8b0ddfe4e these patches let ,,oldstyle'' and freetype subtitle renderers live
together happily. if an oldstyle subtitle (font.desc) is found, it will
be used. otherwise mplayer will choose subfont.ttf, if freetype was
detected during ./configure.
(also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too)
patch-set by Wojtek Kaniewski <wojtekka@bydg.pdi.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8636 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-29 14:59:23 +00:00
arpi 7e26b6cc29 PATH_MAX fixed
bugrep by Diego


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8635 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-29 14:36:56 +00:00
henry 29ab7de580 user friendly channel tuning + 10L fix in tvi_v4l (by Stephane Jourdois)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8628 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 22:57:39 +00:00
alex fdf82fcd59 fixed 2 10l-s
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8620 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 15:33:14 +00:00
arpi 52422f3769 The patch adds support for a per-file config, which is loaded before
playing the file.  The config file is looked for in the same directory
as the input file, and in the ~/.mplayer dir.
Magne Oestlyngen <ml@skybert.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8615 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 14:29:41 +00:00
arpi 8d190244d2 It shows not just the progressbar, but progressbar /and/ percentage
for osd levels 2 and 3, and inaddition it adds a new osd level (3)
which also shows total time.
patch by seru <seru@gmx.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8613 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 14:17:38 +00:00
arpi 0e9c0e8aa2 This patch makes subtitle and A-V delays display correctly rounded
("3800 ms" instead of "3799 ms" etc).
Oskar Liljeblad <oskar@osk.mine.nu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8607 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:53:31 +00:00
arpi a40067b39a sh_audio==NULL hotfix by Robert Varga <nite@hq.alert.sk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8594 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 11:39:31 +00:00
arpi 8457972ae4 Here is the patch to make vobsub subtitle use -slang option, I have not made a
new option for vobsub. Now mplayer will use the setting of slang first, and
then langidx from .idx file, if all failed, no sub.
patch by hephooey@fastmail.fm


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8536 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-23 01:54:58 +00:00
arpi 725ff339e7 This patch adds support for vertical subtitle alignment
control. Possible values are top, center, and bottom,
with bottom being the default. Alignment is relevant when
it comes to positioning subtitles with one line (or fewer
lines) of text relative to multi-line subtitles.

It is implemented as a new command (sub_alignment) that
without an argument cycles the alignment (between top,
center, and bottom), or with an argument sets the
alignment (0 for top, 1 for center, 2 for bottom).
The key 'i' is bound to this command.

patch by Oskar Liljeblad (oskar@osk.mine.nu)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8535 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-23 01:37:43 +00:00
arpi 7f1c583447 Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
(skip sections listed in a text file. it also supports creating them)
patch by Michael Halcrow <mah69@email.byu.edu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8532 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-23 00:33:22 +00:00
henry bfddb0aa03 add a TV_SET_CNANNEL command
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8495 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-19 10:09:43 +00:00
arpi d2392f8436 Fallback to builtin (generated from etc/codecs.conf at compile time)
codecs.conf if no ext configfile found.
Based on patch by Sidik Isani <lksi@cfht.hawaii.edu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8468 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-15 23:45:19 +00:00
arpi bbeb54d80a notice vo driver about skipped/dropped frames
patch by Alvaro Lopes <alvieboy@alvie.com>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8451 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-14 17:12:40 +00:00
pontscho 15dc6ef3f7 - fix three submenu bug
- audio/video track hiding
	- normal/double/fullscreen handling
	- dvd audio channel setting bug
- fix file/url/vcd/dvd playing
- fix variables initialization
- some small bug fix
- applied some patch from Rüdiger Kuhlmann


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8424 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-11 01:21:12 +00:00
arpi 1500ec16c5 With this patch the text 'Sub position: x/100' is displayed
every time you move the subtitles with R and T keys (sub_pos).
I find it useful since sometimes when you hold down R and T
you have no idea if anything is happening or where the subs
are going to show next.

patch by Oskar Liljeblad (oskar@osk.mine.nu)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8367 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:18:56 +00:00
arpi 05802842c9 This patch makes it possible to navigate among the subtitles while
playing movies. It can be very useful when using desynched subtitles.
A new command 'sub_step' is added, which takes an integer argument.
'sub_step +1' will immediately display the next subtitle, adjusting
sub_delay as if one had used the 'sub_delay' command to navigate to
the subtitle. 'sub_step -1' displays the previous subtitle and
adjusts the sub_delay. By using these two commands you can navigate
among the subtitles without having to search blindly using 'sub_delay'.

patch by Oskar Liljeblad (oskar@osk.mine.nu)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8366 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:15:56 +00:00
arpi 1d94bbed7d slave-mode commands to get movie length & pos
patch by Balatoni Denes <pnis@coder.hu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8365 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:11:12 +00:00
arpi 919f3710b1 dump subtitles in SAMI format
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8364 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:07:59 +00:00
arpi 268b2c1a0f overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:03:35 +00:00
arpi 7228f67795 dump in JACOsub format
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8361 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-04 23:58:38 +00:00
pontscho 73d2051d61 - audio track handling in menu (idea from Rüdiger Kuhlmann)
- some userfriendly changes in menu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8313 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-29 00:58:25 +00:00
pontscho 4984919e0b add autosync && some 10l bugfix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8312 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-28 23:17:14 +00:00
pontscho 9590c19bbb disabling seek (look the patch)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8307 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-28 19:13:14 +00:00
pontscho 41565580b5 - add Rüdiger Kuhlmann's <mplayer-list-UGa6JdjLujS2@ruediger-kuhlmann.de> patch
- fix one 10l bug


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8306 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-28 19:01:50 +00:00
michael 01c201dbe8 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8255 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-23 10:58:14 +00:00
arpi 422b0d2a4c demuxer_control(), percent position and time length query implemented in
asf, avi, mpeg demuxers.
patch by Balatoni Denes <pnis@coder.hu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8209 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-16 03:42:14 +00:00
albeu 7868d11065 Experimantal OSD menu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8199 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-14 23:49:05 +00:00
albeu 126725660d New config system + cleanup of header inter dependency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8165 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 01:56:42 +00:00
arpi f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
based on patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-06 23:54:29 +00:00
arpi a06abe690c scale sleep time too (-speed)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8069 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-03 02:02:08 +00:00
arpi 74b6f07e68 A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
delay relative to sh_video->timer (or to 0 if audioonly).
It fixes ct: drifts of very long (several hours) playback.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8057 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-02 19:52:59 +00:00
arpi ec12b2922c cleanup of .AVI timestamp calculation (ugly hack from mplayer.c removed,
instead doing it in demux_avi.c, storing private data in priv insteda of
demuxer structs)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8031 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-02 00:45:12 +00:00
arpi 39fe4d0cd3 verbose can be negative
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-01 17:46:45 +00:00
arpi 0dd7124134 get stream back from the demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8024 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-01 16:10:15 +00:00
pl 85e58efc7c avoids segfaults w.r.t to mp3 files handling:
hunk1 => mplayer -fps 42 foobar.mp3 (yeah it's a bit dumb but... ;)
 hunk2 => mplayer *.mp3 + next file + volume increase
 hunk3 => preventive bugfix


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7924 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-26 00:28:48 +00:00
pl 009e5cff13 fixes a segfault when seeking on some mp3 only files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7907 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-25 09:42:55 +00:00
arpi 12bf06a1ad allow cache to be disabled (-nocache should override cachesize autodetection
in stream layer)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7882 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-23 22:07:29 +00:00
arpi f9e3a4bf88 cleanup config option handling in libmpdemux.
removed overcompilacted m_config_register_options() mess - export the
subconfig structs instead


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7868 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-23 17:21:01 +00:00
ranma d5a36f752c add -identify switch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7865 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-23 15:48:56 +00:00
pontscho 8a61cd287b dvd chapter detect function from Gregory Kovriga
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7855 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-22 22:45:30 +00:00
diego 8f12b9b42b Fixed two typos noticed by Sycotic Smith (I think).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7806 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-19 20:26:04 +00:00
kmkaplan 9fe497ed04 10L
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7791 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-19 01:58:34 +00:00
kmkaplan 43ef114abe Mplayer can switch between subtitles of different languages during
playing by press 'j', based on a patch by <hephooey@fastmail.fm>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7781 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 15:44:41 +00:00
pontscho bcc4c6b1ae - dvd aspect changing bug - fixed
- if codec is not found -> sig11 - fixed
- pp autoq handling bug - fixed
- some warning - fixed


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7752 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-16 15:35:28 +00:00
arpi 2491bd0169 more accurate a_pts calculation in AVI -bps (default) mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7750 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-16 14:51:15 +00:00
arpi 1162a169a1 always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7736 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-14 01:39:17 +00:00
arpi e84772b08d compiler warning fixes
patch by Dominik Mierzejewski <dominik@rangers.eu.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7732 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-13 21:58:55 +00:00