diego
37fd66bd41
Split libs that are dependencies and those that are just linker flags.
...
Fixes spurious rebuilds of MPlayer and MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21146 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:42:20 +00:00
reimar
738e5816b9
Fix SVN r21075, it completely disabled OpenGL in almost all cases.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21145 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:36:39 +00:00
diego
84cbc3b50c
Treat fontconfig and FreeType linker flags just like any other linker flag.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21144 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 17:20:32 +00:00
diego
2f3c36c494
Remove stray -I from include dirs in live555 check, it was being duplicated.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21143 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:46:31 +00:00
reimar
cb10c90e19
cosmetics
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21142 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:27:05 +00:00
reimar
1daf47f7d0
Also support absolute url redirection, e.g. http://www.youtube.com/v/buKaqRG2SFA
...
(video does not play anyway though).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21141 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:26:38 +00:00
diego
d021529c71
cosmetics: EXTRA_LIB_MENCODER --> EXTRALIBS_MENCODER
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21140 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:23:35 +00:00
diego
998308f4b2
_ld_tmp vs _ld_x264 typo
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21139 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:15:39 +00:00
diego
a2a96f7b32
Remove --with-x11libdir and --with-livelibdir.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21138 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:13:11 +00:00
diego
f1f4317665
Attempt to properly fix linking of encoding libs used by libavcodec.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21137 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 16:00:00 +00:00
reimar
68faef14e9
Reuse init_vo_spudec in subtitle switching code.
...
Also generalize vobsub and ass init code to work for demuxers
besides matroska (fixes subtitle switching with
http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4 )
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21136 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:48:00 +00:00
reimar
c99a4cad08
Move vo_spudec initialization into a separate function, for later reuse
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21135 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:43:23 +00:00
diego
95de8f239f
Remove libdha from LIBS_MPLAYER.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21134 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:40:53 +00:00
diego
a2f2b75f7c
ALSA can be used by both MPlayer and MEncoder.
...
patch by Carl Eugen Hoyos, cehoyos (at) ag.or.at
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21133 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:15:13 +00:00
diego
ce672fbf1b
Fix linking when libavcodec uses x264.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21132 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 15:12:55 +00:00
diego
196ec9d95f
Remove _ld_x264 _toolame_lib _twolame_lib, they are no longer needed.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21131 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 13:53:32 +00:00
diego
7c04fdf4c4
_ld_xv does not exist anymore.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21130 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 13:45:11 +00:00
diego
c16c950f59
Add _libs_mplayer and _libs_mencoder to cc_check.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21129 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 13:44:42 +00:00
diego
9a74bfd165
Introduce _libs_mplayer and _libs_mencoder to get rid of some _ld_ variables.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21128 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 13:18:56 +00:00
diego
cc9eb2aac3
Move FFmpeg library dependencies into the Makefile just like everything else.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21127 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:49:46 +00:00
diego
40b99d0282
Move some Win32 LDFLAGS into _ld_extra.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21126 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:16:12 +00:00
diego
43c4abaf0c
Merge MPlayer-specific libs into one variable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21125 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:12:19 +00:00
diego
406f7d342d
Remove _ld_win32, this is handled by the Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21124 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 12:04:41 +00:00
diego
6178e38e46
Split libvo.a into two libs so that libosd.a can be used by MEncoder.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21123 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:49:47 +00:00
diego
3f6df7b998
Remove superfluous empty variable declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21122 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:35:41 +00:00
diego
7a4c86b2ca
Remove unused -D from CFLAGS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21121 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:29:26 +00:00
diego
d52d16f96e
Remove superfluous empty variable declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21120 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:25:44 +00:00
diego
91a713bcc7
Add VIDIX to LIBS_MPLAYER directly.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21119 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:21:09 +00:00
kraymer
3f0eb464e2
typo / small fixes
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21118 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 01:14:58 +00:00
nicodvb
1895a924dc
demux_lavf handles video stream switching
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21117 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 23:34:27 +00:00
nicodvb
a9eada9189
check we aren't short of sh_videos before allocating another one
...
and fail if the allocation doesn't succeed;
added support for video stream switching
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21116 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 23:31:01 +00:00
nicodvb
a6961fa26f
slight simplification in demux_control_ts: no need to check *arg with last_{aid,vid} (small bugfix, too)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21115 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 21:03:46 +00:00
eugeni
bec3287bd4
Cosmetics: remove unneeded curly brackets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21114 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 17:13:19 +00:00
eugeni
852e37033b
Fix collision detection. The old method tried to avoid gaps between subtitles
...
by moving the upper subtitle down. This is wrong. With this fix, a subtitle
will be moved only if it overlaps with another one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21113 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 17:10:18 +00:00
diego
ef10c853f9
Remove --with-xmmsplugindir and --with-xmmslibdir.
...
This is not perfect, whoever cares about this feature do it properly, please.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21112 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 17:08:13 +00:00
diego
a1a3ffb77d
Remove --with-x264libdir.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21111 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:59:09 +00:00
diego
07b02cc94a
Remove --with-xvidlibdir.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21110 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:51:09 +00:00
diego
8ac4f3fce1
Remove --with-toolamelibdir from help output as well.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21109 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:40:07 +00:00
diego
deeb85eb2b
Remove --with-toolamelibdir.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21108 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:14:47 +00:00
diego
2b1b586634
Add support for disabling MPlayer compilation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21107 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 16:14:01 +00:00
diego
aa883180fb
Oops, the loader stuff needs to be in COMMON_LIBS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21106 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:49:08 +00:00
diego
71c7b6353e
Deliver dependency handling from redundancy.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21105 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:45:33 +00:00
diego
6ea42bcf02
Remove MPlayer-specific dependencies from COMMON_DEPS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21104 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 14:27:00 +00:00
diego
4086945ce6
VIDIX is for MPlayer only.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21103 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:57:12 +00:00
diego
9314030e44
The GUI is only for MPlayer, not MEncoder.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21102 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:39:36 +00:00
diego
71a08757e8
Rename variables for consistency.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21101 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:38:21 +00:00
diego
6437823387
Simplify gui and menu libs handling.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21100 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:34:47 +00:00
diego
e2da505741
cosmetics: Move some stuff around for better readability.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21099 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 13:00:26 +00:00
uau
8d6ef999b1
Move pause loop into a separate function.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21098 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:37:23 +00:00
diego
bbe643b5b1
Clean up PARTS handling.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21097 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:20:37 +00:00
