0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Commit Graph

27145 Commits

Author SHA1 Message Date
Uoti Urpala
af3fcdf2de Merge svn changes up to r27025
Conflicts:

	command.c
	libvo/vosub_vidix.c
	libvo/vosub_vidix.h
	mplayer.c
2008-06-07 19:57:57 +03:00
diego
4653f5ed75 Restore support for compiling with svgalib_helper.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27025 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 14:32:06 +00:00
diego
b248b393df Only check for VIDIX PCI device name database if VIDIX is enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27024 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 14:00:04 +00:00
diego
24b27f92c1 Make sure that the LC_ALL variable is exported to the environment of
shell commands invoked by make.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27023 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:54:49 +00:00
ben
883dfcb409 Factorizes dvdnav aid retrieval code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27022 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:13:15 +00:00
ben
9b52abcb8b Add routine that provides audio ID corresponding to logical number
in dvdnav stream.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27021 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:06:27 +00:00
ulion
7b17a4e2c4 Fix channel order for libvorbis decoder, original patched by Nicolas George.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27020 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:04:53 +00:00
ulion
2e7dc8d9fb rename AF_CHANNEL_LAYOUT_LAVC_VORBIS* => AF_CHANNEL_LAYOUT_VORBIS*.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27019 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:57:36 +00:00
ben
c71d348a7d Rename some functions as they are mplayer related and not
from libdvdnav public API.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27018 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:57:23 +00:00
ben
51880f9029 rename for consistency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27017 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:42:40 +00:00
ben
c655b2d499 Add routine to determine if SPU has changed in dvdnav stream.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27016 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:42:00 +00:00
ben
a5d9a2b2b0 Add routine to determine if audio has changed in dvdnav stream.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27015 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:37:32 +00:00
ben
4f99e19300 declare some functions as static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27014 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:02:56 +00:00
diego
0ed0cb1af4 No need to set LC_ALL=C for individual shell commands,
it is already set from config.mak.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27013 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:01:29 +00:00
diego
15729258fc The VIDIX PCI files should be regenerated when the awk script
that creates them is changed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27012 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 11:53:29 +00:00
ben
494da54eaf remove C++ inclusion guard from vidix headers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27011 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 11:47:33 +00:00
diego
d47186c5d8 Add default definition for SVGA device.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27010 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 11:45:25 +00:00
ben
6212ebbcae remove useless vidix versioning stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27009 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 11:43:57 +00:00
ben
4e08014790 remove duplicated code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27008 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 11:38:11 +00:00
ben
b7391dde39 Drop some useless parameter from vidix init routine
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27007 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 10:56:42 +00:00
ben
de97a24d3f Drop support for external libvidix (unmaintained and not up-to-date)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27006 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 10:54:07 +00:00
ben
d0bfe9916c Save DVDNAV palette info.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27005 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 10:30:49 +00:00
ben
8e717d77c7 vidix s3 headers was missing proper header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27004 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 10:25:07 +00:00
diego
a645f8ecd5 Remove unused variable, fixes the warning:
vidix/sysdep/pci_linux.c:71: warning: unused variable 'config_cmd'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27003 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 09:41:51 +00:00
ben
a3e6050aa1 Removed unused freepath variable.
Patch by Guillaume Lecerf <foxcore at gmail com>



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27002 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 23:24:39 +00:00
compn
8d112e9a4a add VIDM fourcc to divx/xvid, based on this patch:
http://sisyphus.ru/srpm/Sisyphus/mplayer/patches/10
https://bugzilla.altlinux.org/show_bug.cgi?id=12211
tested with file created using vidm.dll


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27001 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 20:26:19 +00:00
compn
499de0f563 add psiv codec, works on psi_v-sample.mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27000 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 18:55:38 +00:00
compn
bf2e607c7e add qtactl codec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26999 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 18:18:46 +00:00
diego
8c2a0db59a Remove unnecessary -o option from windres invocation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26998 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 17:15:32 +00:00
diego
c2288ba9d2 Fix codec-specific options syntax declaration to be less confusing and wrong.
The option separator is a colon, all options can receive parameters, not just
the first one. Closes Bugzilla #1100.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26997 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 16:21:41 +00:00
gpoirier
d45a78e6d7 sync w/r26806
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26996 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 16:05:42 +00:00
diego
f9810c0dfb Fix the linking of TOOLS/netstream and TOOLS/vivodump.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26995 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 13:28:25 +00:00
diego
92f79295d2 Use standard license header, merge changelog into license header and TODO.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-06 00:45:35 +00:00
ben
45509b2576 Remove useless braces on if() statement.
Patch by Guillaume Lecerf <foxcore at gmail com>



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26993 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-05 19:47:04 +00:00
ben
8d4cdcc158 Ensure 'path' string is 0 terminated.
Patch by Guillaume Lecerf <foxcore at gmail com>



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26992 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-05 19:46:16 +00:00
gpoirier
ae29cb22de fix fixes, patch by Benoit Fouet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26991 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 20:15:04 +00:00
diego
221c74984e Run the whole documentation through ispell.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26990 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 15:54:47 +00:00
diego
51e0f7d1a4 Remove another reference to a removed configure option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26989 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 13:00:01 +00:00
diego
a697138938 Remove references to removed configure options.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26988 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 12:58:01 +00:00
diego
6f64126b89 Get rid of needless emphasis.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26987 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 12:38:45 +00:00
diego
f97e481a30 Document VIDIXIVTVALPHA environment variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26986 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 11:38:44 +00:00
diego
12d1c53d73 Move Matrox TV-out cable section to the end of the Matrox chapter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26985 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 11:34:17 +00:00
diego
bf3e6467e0 Move Matrox TV-out cable instructions into their own section.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26984 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 11:32:57 +00:00
diego
e3d4291076 Fix some typos and update the Matrox TV output section. The relevant
tools are no longer part of the MPlayer source tree.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26983 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 11:27:51 +00:00
diego
7f68edbc37 Remove unnecessary mangle.h #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26982 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 09:44:12 +00:00
gpoirier
eabc14bd7a sync w/r26909, patch by JRaSH %jrash06 A 163 P com%
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26981 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 09:28:42 +00:00
Uoti Urpala
d5c868325c Merge svn changes up to r26979
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
2008-06-04 08:10:48 +03:00
michael
249149095e Remove due to objections by ivan.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26980 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 03:35:41 +00:00
diego
5b3834c5d1 small spelling/wording fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26979 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 00:51:45 +00:00
diego
f853a298f3 mphq2 runs svn 1.4.x.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26978 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-04 00:48:24 +00:00