1
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 01:36:25 +01:00
Commit Graph

8619 Commits

Author SHA1 Message Date
arpi
e29bcd7e02 This patch adds a call to subcp_recode1(), so this subtitles too are
processed through iconv().
Kresimir Kukulj                      madmax@iskon.hr


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8619 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 15:19:41 +00:00
rathann
64c7077884 Me: -sub-bg-* would be nicer. "Background" is usually shortened as "bg", not "bkg".
Arpi: feel free to change... ASAP :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8618 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 15:03:23 +00:00
jonas
ff7fea6500 cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8617 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 14:56:56 +00:00
arpi
42998b9241 missing #endif
noticed by Mark Szabo mw3@bsd.hu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8616 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 14:36:03 +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
90e4cb1c23 some 10l bugfixes
patch by Christian Ohm <chr.ohm@gmx.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8614 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 14:19:07 +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
46f0f3351c The patch fixes a nullpointer dereference and free of NULL in demux_close_xmms
when no matching plugin was found.
 Alexander.Gottwald@informatik.tu-chemnitz.de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8612 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 14:06:48 +00:00
jonas
ac12fb17b6 I got colas ready, new options, fixes and a few cosmetics I forgot to remove...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8611 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 14:04:56 +00:00
arpi
ff554dc0a0 The following patch allows the MPlayer "cdparanoia" support to work on
NetBSD-1.6_STABLE, both "cdda://NN" and "cddb://NN" URI's.

The CDROM ioctl's are actually more like OpenBSD's than FreeBSD's. I
went with the "/dev/cdrom" symlink as the default device, though, as
it otherwise gets messy fast... The first CDROM is "/dev/rcd0d" on
NetBSD/i386, but "/dev/rcd0c" on all other NetBSD ports, and only the
cdda_identify_scsi() form seems to work on NetBSD. (I searched the web
in vain for the Paranoia API, so I'm left to hacking. ;-))

Frederick Bruckman <fredb@immanent.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8610 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 14:04:54 +00:00
arpi
86f78f0cf3 just quells warnings in the ".depends" generation phase.
patch by Frederick Bruckman <fredb@immanent.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8609 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 14:03:30 +00:00
anders
6adaa78ee9 Changes includes:
- Improved runtime control system
- 3 New filter panning, compressor/limiter and a noise gate
  - The compressor/limiter and the noise gate are not yet finished
  - The panning filter does combined mixing and channel routing and
    can be used to down-mix from stereo to mono (for example)
- Improvements to volume and channel
  - volume now has a very good soft clipping using sin()
  - channel can handle generic routing of audio data
- Conversion of all filters to handle floating point data
- Cleanup of message printing
- Fix for the sig 11 bug reported by Denes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8608 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:59:53 +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
nicolas
21024dd13d Added missing <CODE> tag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8606 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:52:09 +00:00
arpi
cfa30a8b32 This patch fixes the reading of the menu.conf, because stream_open()
isn't a good idea, it messes with dvd playback.
Andreas Hess <jaska@gmx.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8605 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:46:55 +00:00
arpi
bd814ee879 ao_oss was not using the channel & format returned by the soundcard
for ao_data.bps calcualtion - hence fscked up av sync if soundcard didn't
support a number of channels or audio format.

patch by Balatoni Denes <pnis@coder.hu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8604 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:45:04 +00:00
arpi
d3b9403406 Attached is a small patch to fix a couple of problems I found when using
.SSA subtitle files:
1) A comma appears at the beggining of the text. From comments on the
code this seems to be a delicated matter, so I just added a conditional
to eliminate the comma if it is at the beggining of the string.
2) It looks like this format uses {*} for attributes, like {/fs36} to
select "font size 36pt". These things becomes really annoying when
displayed with the real text ;-), so I added a simple filter to collapse
all the text enclosed with { and }.

Salvador Eduardo Tropea <salvador@inti.gov.ar>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8603 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:42:24 +00:00
arpi
17c39c4e57 The following patch adds two new command line options:
-sub-bkg-color n
-sub-bkg-alpha n
They control the color and alpha value used to initialize the subtitles and OSD BBOX.
With this you can have subtitles inside a traslucent rectangle.
This is useful when a movie already have "hardcoded" subtitles and you
want to overwrite them with rendered subtitles avoiding too much confusion.

patch by Salvador Eduardo Tropea <salvador@inti.gov.ar>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8602 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:41:02 +00:00
arpi
288868f16a Lots of functions and variables specific to OSS audio are used without
ifdefs, so it is not possible to compile mplayer without enabling it,
alse some are already ifdefed, so it is a mess.
patch by Filip Kalinski <filon@pld.org.pl>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8601 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:39:51 +00:00
nicolas
3bf75ee497 sync
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8600 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 13:37:18 +00:00
arpi
526ddd9235 "MPlayer does the right thing, presents frame 9 for 1.1 seconds, and continues
with frame 20. MEncoder calculates the right "frame_time", but duplicates the
frame following the gap, i.e. frame 20 is presented for 1.1 seconds."
patch by Jan Kritzner <kritzner@i4.informatik.rwth-aachen.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8599 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 12:51:05 +00:00
nicolas
3dadd43257 sync
typo


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8598 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 12:40:59 +00:00
nicolas
1d0f957d07 sync
html fixes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8597 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 12:22:51 +00:00
arpi
7fcc474e3b i hate asserts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8596 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 12:14:57 +00:00
arpi
2e399f394d DVB-HEAD (aka. NEWSTRUCT) detection & support
patch by Dimitrios Dimitrakos <mail@dimitrios.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8595 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 12:04:58 +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
584f9df070 updates, moves
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8593 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 00:55:54 +00:00
nexus
4a686ca416 FreeBSD fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8592 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 00:48:07 +00:00
arpi
b20d743707 ffmp2 (with mpeg files) sig11 fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8591 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 00:40:11 +00:00
michael
625616cfbe wmv2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8590 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 00:26:10 +00:00
michael
ae2c1b6b0c lavc motion estimation update
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8589 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 00:23:26 +00:00
michael
1f7e904479 lavc 4647
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8588 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 00:04:20 +00:00
arpi
c8166827b5 5l - fixed asserts... mpi->width is allocated width, not the effective one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8587 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 00:01:28 +00:00
arpi
bf46a109ed the long-waited MUXER layer, and new MPEG-PS muxer
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8586 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 22:43:20 +00:00
arpi
bc9afe8d39 prefer inttypes.h (probably fix cygwin compile)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8585 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 22:38:56 +00:00
arpi
501706292e -subwidth
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8584 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 21:41:40 +00:00
alex
971294ed0e typo in the datestamp (Dez vs Dec ;)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8583 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 19:36:20 +00:00
alex
28f398c16f obsolete
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8582 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 18:04:52 +00:00
alex
ba7fa8e1c9 some addons
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8581 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 17:56:00 +00:00
alex
70e7a5533c do not config video out system if input dimensions are invalid (triggered a segfault in vop_expand due to missing dimension checks, which bug was reported by gabucino)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8580 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 17:31:52 +00:00
arpi
62490c001c backward compatibility :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8579 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 17:28:35 +00:00
alex
fc447a4d4c 10l memory leak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8578 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 16:42:11 +00:00
jkeil
03e3deb95c - Fix 8-bit sound in arts audio driver (logic in OBTAIN_BITRATE macro was
broken)
- arts server always expects 16-bit sound in little endian byte order, even
  in the case the artsd server runs on a big endian machine.  Make sure that
  mplayer's audio filters convert the samples into one of the arts supported
  sound formats.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8577 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 16:35:29 +00:00
jkeil
2ae8812645 Fix DVD authentication on Solaris 9.
Solaris 9 does not allow USCSICMD ioctls for non-root users on vold devices
any more; they are failing with an EPERM "permission denied" error.  Now, only
root is allowed to run USCSICMD ioctls on vold devices.

Fortunatelly there's a new subroutine exported from libsmedia.so
(smedia_uscsi_cmd) which allows non-root users to perform user mode SCSI
commands on a vold device.  (This works with a help of a daemon running as
user root, /usr/lib/smedia/rpc.smserverd)

This change detects the presence of function "smedia_uscsi_cmd" in library
libsmedia.so at runtime, and uses this function if it's found (i.e. on
solaris 9 smedia_uscsi_cmd() is used to execture user mode scsi commands).
On solaris 8 or older, "smedia_uscsi_cmd" is not available and the code
falls back to the old ioctl(.. USCSICMD ..) method.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8576 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 16:29:11 +00:00
jkeil
a24ab94f06 Oops, missing Makefile in the esd audio driver check-in; libao2 Makefile needs
esd include flags


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8575 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 16:20:02 +00:00
jkeil
e2d96e7083 codec-cfg cannot be built when the gui is enabled - it fails to link with a
couple of undefined external references.
Problem is that mp_msg.c is included in the codec-cfg binary, but for codec-cfg
the gui code in mp_msg.c shouldn't be compiled in.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8574 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 16:17:57 +00:00
jkeil
30c23e4946 new EsounD audio driver (-ao esd)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8573 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 16:02:57 +00:00
diego
bb0678255c typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8572 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 01:19:41 +00:00
arpi
63cffa669e pnm:// support (ported from xine)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8571 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-26 17:25:22 +00:00
arpi
2d8b958327 fixed playback of pnm:// streamed files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8570 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-26 16:27:38 +00:00