RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 13:14:36 +00:00
Code Issues Releases Wiki Activity
32,506 Commits 41 Branches 86 Tags 163 MiB
e3c6f09752
Commit Graph

1002 Commits

Author SHA1 Message Date
Uoti Urpala
d136cf6882 Merge svn changes up to r29134 2009-04-02 23:55:13 +03:00
bircoph
e3b6f71b2d Add libbs2b audio filter itself. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29132 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-02 19:01:57 +00:00
diego
77416e41cf Add recently added FFmpeg subdirs to DIRS variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29125 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-02 08:42:16 +00:00
Uoti Urpala
58497380e5 Initial ordered chapters support 
Add basic support for Matroska ordered chapters. The switching between
segments is implemented as a general edit timeline that could also be
used for other purposes.

Some things still need improvement. In particular the current code
does not try to do any proper mapping between audio/video/subtitle
streams of different files and there should be options for better
control of how MPlayer searches other files for the required content.
 2009-04-02 06:51:25 +03:00
diego
1888de07f7 Do not use full CFLAGS to build codec-cfg, they are unnecessary. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29041 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-23 22:42:53 +00:00
Uoti Urpala
ae2faad666 Merge svn changes up to r28951 2009-03-14 23:52:45 +02:00
diego
366c3fa13d KVA vo driver for OS/2, patch by KO Myung-Hun, komh chollian net 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28950 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-14 18:44:58 +00:00
diego
36910ebe97 Only compile fastmemcpybench on x86. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28945 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-14 15:56:16 +00:00
diego
143a63fd9e Fix and restructure fastmemcpybench. It is now one binary that runs all 
available memcpy variants and prints benchmark results about them.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28929 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-10 10:05:09 +00:00
reimar
601d694829 Remove native nuv demuxer, it only needs more code to achieve the same thing 
as the libavformat demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28907 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-09 13:11:37 +00:00
reimar
591ce556b7 Make fastmemcpybench almost working - only thing missing is a way to 
override HAVE_MMX etc. from config.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28906 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-09 12:59:14 +00:00
diego
15b605c690 Fix fastmemcpybench tools build: 
- HAVE_MMX and friends now have 0/1 values and are always defined.
- Use proper file dependencies instead of a phony target.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28899 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-09 00:48:03 +00:00
michael
1f61255588 Add test for C memcpy() 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28894 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 15:56:20 +00:00
reimar
e9f1f090e8 rtjpegn.c is only needed by the NuppelVideo encoder, change Makefile accordingly 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28889 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 13:56:35 +00:00
reimar
276a73e2f2 Remove internal NuppelVideo decoder, the code in libavcodec can decode 
those files and some more and is far more maintainable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28888 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-08 13:32:42 +00:00
Uoti Urpala
e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
diego
1005952a8b Only add -Ilibdvdnav to the CFLAGS of the files that require it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28829 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 22:19:47 +00:00
diego
3e40788623 Simplify CFLAGS generation for individual targets. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28827 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 21:27:05 +00:00
diego
95dac90527 Simplify some vidix dhahelper build commands with automatic make variables. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28815 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-05 20:25:54 +00:00
diego
23599b030c DART audio output driver for OS/2 by KO Myung-Hun, komh chollian net 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28775 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 11:36:39 +00:00
diego
c003bcdcab Fix 10l typo in ADD_ALL_EXESUFS function name. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28772 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 11:22:31 +00:00
diego
e96ebebaf0 codec-cfg does not depend on codecs.conf.h, it is used to generate it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28771 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 11:07:05 +00:00
diego
3c3495a122 Make all object files depend on generated header files. 
This solution does not record precise dependencies but is robust
against header dependency changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28770 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 11:03:18 +00:00
diego
48d2eb7209 Add explicit dependencies on generated header files for the object files along 
with the dependency information files. This fixes a straight build without
generating dependency information.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28769 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 10:53:37 +00:00
diego
b63817b215 Fix dependencies on generated header files for the codec* binaries. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28768 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 10:52:26 +00:00
Uoti Urpala
66f6f9f076 Merge svn changes up to r28712 2009-02-23 21:00:52 +02:00
diego
0cddea3754 Add statistics audio filter that prints information about the audio stream. 
patch by Nicolas George, nicolas.george normalesup org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28696 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-21 21:27:27 +00:00
Uoti Urpala
186e5a998c Merge svn changes up to r28641 
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
 2009-02-18 01:45:36 +02:00
reimar
7e9fd9351c Add support for VDPAU video out, including hardware decoding. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-16 20:58:13 +00:00
Uoti Urpala
0bf2bd91ec Merge svn changes up to r28610 2009-02-16 02:39:58 +02:00
reimar
b8c7c3ff11 Create a fmt-conversion.c file so fmt-conversion.h can be included by multiple files. 
Also restructure the code so it provides a pixfmt2imgfmt function, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28561 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-14 17:57:47 +00:00
Uoti Urpala
738f66b1bc Merge svn changes up to r28549 2009-02-13 03:52:51 +02:00
diego
62ca18ed47 Ignore errors from all rm commands in clean targets. 
This way make will not stop on failure and remove as much as possible.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28540 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-12 12:32:16 +00:00
diego
802f91138e On clean/distclean, remove binaries with all types of executable suffixes. 
This helps clean a tree completely before and after crosscompiling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28539 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-12 12:17:50 +00:00
diego
1c8e4bfc9f Use addprefix and addsuffix functions to generate TOOLS variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28538 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-12 12:13:07 +00:00
Uoti Urpala
1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
diego
cdfafa6999 Add priority support for OS/2 and factorize the Windows priority support. 
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28520 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-10 15:34:44 +00:00
diego
49f88ad861 Conditionally compile aclib.c instead of placing #ifdef around its content. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-08 03:42:00 +00:00
diego
57f3f10ad0 cosmetics: Remove stray tab. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28464 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-04 18:34:39 +00:00
diego
4bfd1ebc96 We use libdvdcss 1.2.10, not 1.2.9. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28463 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-04 18:32:32 +00:00
Uoti Urpala
9790f4e6e7 Merge svn changes up to r28461 2009-02-04 00:28:17 +02:00
diego
74a216ea56 Remove -c option from install commands. It is ignored by GNU install and 
incompatible with some other install commands.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28423 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 11:32:58 +00:00
diego
e7ecd5119a Slightly simplify VIDIX_PCI_FILES command. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28410 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-31 22:46:12 +00:00
Uoti Urpala
ccf4d9e96c Merge svn changes up to r28403 2009-01-31 04:52:15 +02:00
diego
eb4a4604c0 HAVE_3DNOW --> HAVE_AMD3DNOW 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-26 09:29:53 +00:00
diego
418ce8eb05 version.h depends on version.sh. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28369 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-26 09:11:23 +00:00
Uoti Urpala
dd888b05ff Merge svn changes up to r28366 
Contains more changes needed to sync build system with latest FFmpeg.

Conflicts:
	Makefile
	configure
	mplayer.c
 2009-01-26 00:58:15 +02:00
diego
401ea8e1db HAVE_3DNOWEX --> HAVE_3DNOWEXT 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28361 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-25 21:03:02 +00:00
diego
2067a1f750 Factorize print_version(). 
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
 2009-01-25 20:35:58 +00:00
Uoti Urpala
9bcd12fdf5 Merge svn changes up to r28310 
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
 2009-01-15 05:57:31 +02:00
reimar
1ee1a271f8 Support an "internal" dvdnav version to make it easier to compile with, 
test and debug dvdnav SVN.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28291 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-10 13:51:02 +00:00
reimar
4af9bf7e02 Switch internal dvdread to libdvdread SVN external. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-08 19:28:28 +00:00
Uoti Urpala
c1b80dcbbb Merge svn changes up to r28204 2008-12-27 17:40:57 +02:00
Uoti Urpala
64b22229e3 Makefile: Fix live555 compilation 
The change to create .d files with .o incorrectly used CFLAGS instead
of CXXFLAGS when compiling .cpp files. This broke the build if
live555, which is the only part using C++ code, was enabled.
 2008-12-22 16:45:32 +02:00
diego
91748b4278 libavcodec/i386/ was renamed to libavcodec/x86/. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28177 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-22 09:20:18 +00:00
Uoti Urpala
71b25cca76 Merge svn changes up to r28162 2008-12-19 00:29:24 +02:00
diego
42a8a5a388 another round of armv4l --> arm changes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28159 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-17 08:47:01 +00:00
diego
e3f05c1247 libavcodec/armv4l/ was renamed to libavcodec/arm/. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28158 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-17 01:10:34 +00:00
Uoti Urpala
bc4c570ab1 Makefile: prevent default build rules being used on FFmpeg files 
After adding .o files to the dependencies of FFmpeg .a files make
tried to build those .o files with default rules before recursing to
the FFmpeg subdirs. Fix this by adding a dummy rule. Also fix
incorrectly placed parentheses in the command creating the FFMPEGFILES
list. That resulted in some files being listed multiple times,
triggering warnings from the dummy rule.
 2008-12-06 06:21:53 +02:00
Uoti Urpala
a36945fe44 Makefile: Rebuild FFmpeg libraries when .asm and .o files change 
There was a missing dependency that meant FFmpeg libraries were not
recursed if only .asm files changed. Also add a dependency on .o files
to update the corresponding .a (though this case should only happen if
you run compilation commands manually).
 2008-12-06 05:33:33 +02:00
Uoti Urpala
2a6178e5ab Makefile, common.mak: Create .d files when creating corresponding .o 
The separate .d file creation logic has caused various problems, most
notably cases where 'make' exits without doing anybut but without
giving any error either. Change the Makefile so that .d files are
always created or updated when the corresponding .o file is. This
avoids the problems of current .d file generation and still gives
correct dependencies.

The common.mak change does the same for the libswscale build. However
it does not affect the directories under ffmpeg/ because those use
ffmpeg/common.mak. The MPlayer common.mak can be copied over the
ffmpeg/common.mak file to make the fix apply to the FFmpeg directories
too. This is not done automatically because the FFmpeg file is under
version control and changing it could cause problems.
 2008-12-06 05:33:33 +02:00
Uoti Urpala
b37a869f13 Makefile: Don't use "install -d" on existing directories 
Makefile used "install -d" on directories like "/usr/local/bin".
Because the install program always tries to set permissions this
command causes an installation failure if the directory exists and is
writable but you cannot change its permissions (default configuration
for group staff on Debian for example). So avoid running such commands
on existing directories.
 2008-12-06 05:33:32 +02:00
Uoti Urpala
8c144171bb Merge svn changes up to r28087 
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
 2008-12-04 01:55:52 +02:00
diego
6ee9519304 Treat video output objects the same as everything else in the build system, 
i.e. have lines that conditionally enable each in the Makefile and
corresponding variables set from configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28080 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 14:48:31 +00:00
diego
c485f7b15c cosmetics: Rename ZORAN Makefile variable to ZR for consistency. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28077 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 12:47:29 +00:00
diego
187f10e142 Treat audio output objects the same as everything else in the build system, 
i.e. have lines that conditionally enable each in the Makefile and
corresponding variables set from configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28075 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 12:05:47 +00:00
Uoti Urpala
14d3193391 Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compile 
codec-cfg runs on the host system but EXTRA_INC can have target system
paths. The EXTRA_INC was added there for shared libavutil support.
Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h
(which in turn needed libavutil) instead of including the header, and
drop the EXTRA_INC flags.
 2008-12-02 20:54:13 +02:00
Uoti Urpala
e62517ef6a Merge svn changes up to r28065 2008-12-02 18:02:05 +02:00
diego
c612907d1c MNG demuxer by Stefan Schuermans, stefan blinkenarea org 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28052 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-30 13:22:34 +00:00
Uoti Urpala
1715c2a336 Merge svn changes up to r27949 
Conflicts:
	common.mak
	libvo/vo_xv.c
	libvo/x11_common.c
	libvo/x11_common.h
	stream/cache2.c
 2008-11-17 20:50:23 +02:00
bircoph
29f16f45f1 Add yasm support to the build system. 
This allows to use yasm assembler optimizations from FFmpeg code,
in particular, from libavcodec/fft.c.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27940 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-16 13:04:16 +00:00
Uoti Urpala
0301309425 Merge svn changes up to 27824 
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
 2008-10-25 05:12:34 +03:00
diego
6fa340d54c Create LIBDIR for binary codecs upon make install. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27793 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-16 20:25:41 +00:00
Uoti Urpala
ebb4abf208 Merge svn changes up to r27682 
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.

Conflicts:
	command.c
	mplayer.c
 2008-10-02 05:17:23 +03:00
diego
0189fa7cac 10l: Remove deleted file libmpeg2/motion_comp_iwmmxt.c from Makefile as well. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27678 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-01 06:47:26 +00:00
Uoti Urpala
849dc0ba31 Merge svn changes up to r27649 
Conflicts:
	Makefile
	configure
	libvo/x11_common.c
 2008-09-20 16:13:33 +03:00
rathann
c8d9bf0f50 Add shared libswscale support. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27632 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-16 22:30:22 +00:00
rathann
a5e9a8d0ca External liba52 support, part 2 of 2. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27620 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 16:32:31 +00:00
diego
853d571d48 Use standard -I flags to compile codec-cfg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27618 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-15 15:34:26 +00:00
Uoti Urpala
b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
rathann
97e5f304ce Rename internal libdvdread fork from dvdread to libdvdread 
to avoid clashing with external libdvdread.
(Sync with libdvdread r1122)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-30 12:22:21 +00:00
diego
c7c06f3050 Remove SKIP_DEPS trick. The same effect can be achieved without it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27471 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-18 06:30:10 +00:00
diego
5c30ab6feb FFmpeg no longer has fastmemcpy support, so no longer trigger recursing 
into the FFmpeg directories if libvo/fastmemcpy.h changed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27465 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-14 20:42:54 +00:00
Uoti Urpala
e09fe1ce04 Merge svn changes up to r27458 2008-08-12 15:03:34 +03:00
ben
8903c510f8 Add VIDIX driver for SuperH Mobile VEU hardware block. 
Patch by Magnus Damm <magnus dot damm at gmail dot com>.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27452 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-11 23:10:03 +00:00
diego
6d01235f44 Skip dependency generation if we just run distclean or if skipping 
is requested explicitly on the command line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27443 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-09 13:53:19 +00:00
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441 
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
 2008-08-08 02:13:09 +03:00
diego
af76be6e19 Add separate variables for CFLAGS that are specific to internal libraries 
and only add them to CFLAGS when compiling objects from those libraries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27436 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 21:46:06 +00:00
diego
b3e99753a3 cosmetics: Rename some CFLAGS-related variables. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27434 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 21:03:14 +00:00
diego
2d6b7f320b 10l: Remove stray backslash at end of line. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27433 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 20:32:02 +00:00
diego
d04687fc92 Merge two redundantly declared lines into one. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27432 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 12:36:31 +00:00
diego
a64801ec63 cosmetics: Sort things into alphabetical order in various places. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27431 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 12:35:34 +00:00
diego
e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and 
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 12:20:50 +00:00
diego
5641e60698 Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27426 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 10:57:40 +00:00
diego
34fb06087b Revert mistakenly committed temporary local change. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27405 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-03 16:20:34 +00:00
diego
02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from 
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-03 15:21:40 +00:00
Uoti Urpala
6cce822505 Merge svn changes up to r27399 
Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c
 2008-08-02 22:04:35 +03:00
diego
e588ab056d Change a bunch of video-output-specific preprocessor directives from a HAVE_ 
prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27397 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-02 17:38:11 +00:00
Uoti Urpala
04f3909a72 Merge svn changes up to r27374 
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
 2008-07-30 16:39:24 +03:00
diego
771cd67118 Use conditional compilation instead of an #ifdef around the whole file. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 10:26:23 +00:00
diego
3a313f4def Move CFLAGS specific to internal libdvdread and libfaad2 to the Makefile and 
use them only when compiling objects from those subdirectories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27359 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-28 16:57:22 +00:00
diego
65f404c85f Revert to previous dependency checking behavior. 
Take included header files into account when generating dependency files.
This has problems when header files are removed or renamed, but does not
silently miscompile files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27351 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-26 18:36:48 +00:00
Uoti Urpala
2d4656e070 Merge svn changes up to r27332 2008-07-21 15:03:49 +03:00
diego
611c79b782 Remove "en" from list of all man page languages when generating man page 
installation rules from a pattern. There is a separate rule for English above.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27330 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-19 11:32:33 +00:00
diego
adc68058bd Rewrite translation handling in the build system. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27311 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-17 12:36:54 +00:00
diego
33ff3271b1 Evaluate man page installation rule for all available languages, 
but only install the requested languages.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27307 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-17 11:54:42 +00:00
Uoti Urpala
92f0cba26b Merge svn changes up to r27281 2008-07-15 02:59:27 +03:00
diego
4952dbf19a Dependency files should be refreshed when object files are rebuilt. 
Express this with Makefile syntax instead of in the dependency file
generation command.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27268 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-12 08:23:10 +00:00
Uoti Urpala
ca3feba5c3 Merge svn changes up to r27242 
Conflicts:

	Makefile
	configure
 2008-07-09 18:32:51 +03:00
diego
5400ae771d Introduce DRIVER_OBJS variable for list of all driver targets. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27223 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-06 13:41:08 +00:00
diego
24383a02d1 Simplify codecs.conf.h generation rule. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27222 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-06 13:36:17 +00:00
diego
bc6147198a Merge version.h dependency declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27221 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-06 13:31:53 +00:00
diego
bceae3b7e8 Remove redundant dependencies for .rc files. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27220 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-06 13:28:45 +00:00
diego
60fc51e29f Add a generic rule for .rc files and use it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27219 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-06 13:26:30 +00:00
diego
2d603c2473 cosmetics: Merge three lines into two. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27218 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-06 13:18:29 +00:00
diego
67cf52cccb Also remove dhahelper and dhahelperwin on distclean. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27217 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-06 13:06:05 +00:00
diego
b0ab09e0fc Rename ALLPARTSLIBS variable to FFMPEGLIBS. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27205 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-05 09:08:22 +00:00
diego
7c9ad57710 Group some variable declarations together in sensible places. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27204 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-05 09:07:24 +00:00
diego
da6a5a6979 Declare FFmpeg dependencies in a more elegant way using the PARTS variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27203 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-05 08:02:06 +00:00
Uoti Urpala
8ea134bd23 Merge svn changes up to r27202 2008-07-05 02:55:56 +03:00
diego
f3bf43f443 Rename stream_livedotcom.c to stream_live555.c, the name is used everywhere. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27199 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-04 20:14:00 +00:00
diego
3a9b304974 Simplify tool generation rules with a pattern rule. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27193 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-04 14:35:44 +00:00
diego
2a8bfbaa94 Only build loader tests on x86. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27192 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-04 14:33:03 +00:00
diego
65a826f348 Fix liba52/test linking, it needs -lm. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27191 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-04 14:22:54 +00:00
diego
90db8eb5f2 Put common dependencies of mp3lib/test + mp3lib/test2 on a common line. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27189 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-04 13:42:19 +00:00
diego
48436708a6 Declare common netstream + vivodump dependencies in the common place. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27186 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-04 13:02:12 +00:00
Uoti Urpala
7de350c673 Merge svn changes up to r27184 2008-07-01 16:18:21 +03:00
diego
768a2f3851 Fix FFmpeg subdirectory dependencies: The FFmpeg libraries depend on each 
other as well as on two header files in MPlayer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27183 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-01 10:02:05 +00:00
diego
26243c40fa Touch FFmpeg libraries after recursing into their subdirectories. 
Otherwise, if the recursion was due to a changed file that is not built into
the library, the recursion will become unconditional.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27131 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-24 08:55:06 +00:00
diego
ef15210ef1 Do not unconditionally recurse into FFmpeg subdirectories. Instead, just 
recurse if any file in the subdirectory changed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27130 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-24 08:48:04 +00:00
Uoti Urpala
de560e8167 Merge svn changes up to r27123 
Conflicts:

	libmenu/menu_filesel.c
	libmenu/menu_pt.c
 2008-06-23 03:58:44 +03:00
ben
86d8472fb3 renamed vidixlib.c to vidix.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27112 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-20 20:17:38 +00:00
ben
2bd0d969a6 allow conditionnal compilation of yuv4mpeg video out. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27103 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-20 19:33:32 +00:00
diego
f405167bbc Add copyright and license statement. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27097 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-17 11:40:04 +00:00
Uoti Urpala
68e70b3ec3 Merge svn changes up to r27092 
Conflicts:

	libmpdemux/demuxer.c
	libvo/vo_xv.c
	mencoder.c
 2008-06-17 05:04:32 +03:00
diego
2400f5b0d6 Add command to create dhahelper device to install-dhahelper target. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27032 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-08 14:18:51 +00:00
diego
4b34771463 Rename loader/driver.[ch] to loader/drv.[ch], otherwise loader/driver.h can 
conflict with the header by the same name in loader/wine/driver.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27031 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-08 10:43:30 +00:00
diego
108fff3efb Add dhahelper CFLAGS where appropriate if enabled. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27030 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-08 10:41:09 +00:00
diego
cbef90d71f Fix silly typo in CFLAG_SVGALIB_HELPER variable name. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27027 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-06-08 09:28:08 +00:00
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
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
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
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
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
diego
74aa81596c Add install-dhahelperwin target to simplify dhahelper installation on Windows. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26936 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-30 20:10:36 +00:00
diego
13d53795d9 Merge vidix/dhahelperwin/Makefile into top-level Makefile. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26935 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-30 20:09:31 +00:00
diego
5d87f6d9ca Merge vidix/dhahelper/Makefile into top-level Makefile. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26934 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-30 19:39:00 +00:00
diego
6feacc0cc4 The install-drivers target should depend on the drivers target. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26916 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-29 00:33:29 +00:00
diego
61b101497d Merge drivers/Makefile into top-level Makefile. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26914 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-28 12:40:15 +00:00
diego
1bb19a7f48 Move messages header file creation to a separate shell script. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26910 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 22:03:21 +00:00
diego
c9aed45201 Revert declaration .NOTPARALLEL. Unfortunately this special target does not 
have the expected sane semantics, but has a global effect instead...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26904 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 16:46:30 +00:00
diego
b27e02e1b4 Mark VIDIX_PCI_FILES targets as NOTPARALLEL. They are all created 
simultaneously by the same command.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26903 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 16:24:40 +00:00
diego
3447bd1d05 cosmetics: Move toolsclean target to a better place. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26896 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:37:50 +00:00
diego
d1f1b61d02 Update comment heading. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26895 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:31:57 +00:00
diego
e79064d885 cosmetics: Consistently place '-o $@' in compiler command line. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26894 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:29:23 +00:00
diego
5d7c1d1a37 Simplify codec-cfg-test command with $^. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26893 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:28:00 +00:00
diego
e236fc558e Fix codecs2html linking. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26892 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:25:18 +00:00
diego
853c366adb Merge doxygen_clean rule into distclean. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26891 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:24:07 +00:00
diego
2b085d7897 codecs2html and codec-cfg-test are removed by toolsclean. Do not remove 
them redundantly upon distclean.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26890 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:22:55 +00:00
diego
4937b16c44 Add codecs2html to TESTS variable. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26889 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:21:19 +00:00
diego
00b5f90451 Fix dependency declaration for codecs2html. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26888 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:20:27 +00:00
diego
d3ff5799f9 cosmetics: Move some rules to better places. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26887 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:19:35 +00:00
diego
a10452836d Add missing -I. to fix codecs2html compilation. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26886 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:14:24 +00:00
diego
cdbbd38e9b Add codec-cfg-test to list of TESTS. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26885 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:13:43 +00:00
diego
196593fbd4 Correct dependency declaration for codec-cfg-test. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26884 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:09:17 +00:00
diego
250f52082d There is no need to ignore the return value of an 'rm -rf' command. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26883 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 11:05:43 +00:00
diego
f4bd0813d5 Fix codec-cfg-test linking. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26882 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 09:11:13 +00:00
diego
db37cb2fe7 Link codec-cfg programs against mp_msg-mencoder.o instead of mp_msg.o. 
The latter can pick up GUI dependencies.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26881 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-27 09:04:47 +00:00
reimar
793e5b324e Get rid of "define RECURSIVE_RULE" since a lot of make version have problems 
with it, especially with -j n.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26858 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-23 14:52:12 +00:00
diego
745662aafa If character set conversion for help_mp.h is required, do it on the whole 
file including the parts added from the English master file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26836 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-19 00:07:17 +00:00
diego
ab36efa0d7 The multiple inclusion guard in help_mp.h has to cover the whole file, 
including the non-translated parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26835 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-19 00:05:18 +00:00
diego
7016801bae Simplify help_mp.h generation commands by using $@. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26834 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 23:58:05 +00:00
diego
ad9dc7735d Do not hide that we are running a helper script. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26833 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 23:55:01 +00:00
diego
5f7c758c80 Move the logic that decides if untranslated messages need to be added to 
help_mp.h into the helper script that generates those messages.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26832 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 23:33:46 +00:00
diego
955495414e Replace hack to disable iconv conversion of messages with something more sane. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26831 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 23:16:30 +00:00
diego
929365575a Remove unused strip target. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26828 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 17:40:00 +00:00
diego
5ae188e479 Merge directory installation commands. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26827 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 17:38:16 +00:00
diego
fec125516b one less level of indirection for install and program targets 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26826 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 17:35:54 +00:00
diego
b96c2f2ed0 install-mplayer and install-mencoder targets should depend on install-dirs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26823 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 17:16:43 +00:00
diego
7ac3e16660 Do not install DATADIR always, the GUI installation target takes care of this. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26822 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 17:12:49 +00:00
diego
74c67fee1f Install the required man page directories in the man page targets. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26821 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 17:05:55 +00:00
diego
6a8693845c Replace hackish shell loops for man page installation with make constructs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26820 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 17:05:16 +00:00
diego
2ac55e2331 Create directories for the translated man pages in the install-dirs target. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26819 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:43:17 +00:00
diego
049d820592 Introduce make variable common to the GTK and Windows GUI and use it 
in the appropriate places.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26817 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:25:20 +00:00
diego
63b29dabbc install-mencoder-man depends on install-mplayer-man. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26816 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:20:17 +00:00
diego
3661a18bd7 Replace shell for loop with proper foreach make construct in uninstall target. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26815 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:16:39 +00:00
diego
69c70193c7 Always uninstall English man pages instead of never. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26814 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:13:46 +00:00
diego
f931f2440e Remove (hopefully obsolete) codecs.conf workaround. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26813 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:08:46 +00:00
diego
a6458b3065 Introduce a pattern rule for install-mplayer and install-mencoder targets. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26812 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:06:31 +00:00
diego
cdf6e749bc Separate install-mencoder and install-mencoder-man targets. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26811 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:04:51 +00:00
diego
b53e8a4d01 The install-gui target depends on the install-mplayer target. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26810 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:03:44 +00:00
diego
4abe690d64 Simplify installation rules with $<. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26809 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 16:01:46 +00:00
diego
43686e0867 Do not remove gmplayer.1, it is never installed. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26808 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 15:53:55 +00:00
ben
a7807bac14 Sort alphabetically 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26805 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 14:55:26 +00:00
diego
925ab6050f There is no need to ignore errors from 'rm -f' commands. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26804 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 14:23:45 +00:00
diego
fdb2bbc502 Remove skin download instructions, they have no place in the Makefile. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26803 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 14:14:15 +00:00
ben
dc6d14fb1b Add support for AppleIR Remote as an input under Linux systems. 
This requires Linux 2.6 with evdev and appleir drivers.
The keymapping is done to mimics the one that was done for MacOSX.

WARNING: Most distributions do not seems to bother and only let root
access to the device. Modify udev rules accordingly if you want regular
user to be able to use the remote.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26795 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-18 11:53:00 +00:00
Uoti Urpala
a41db36b22 Merge svn changes up to r26783 
Conflicts:

	Makefile
	common.mak
	configure
	libmpcodecs/vd_ffmpeg.c
	libmpdemux/demux_mkv.c
	libvo/vo_xv.c
	mplayer.c
 2008-05-15 21:19:35 +03:00