4bec934234
Split cfg-common.h into two separate header files. It was being included twice
...
with different definitions set that activated either the lower or the upper
half of the header. The effectively simulated using two different header files.
It is more straightforward to split the header instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26392 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 09:48:36 +00:00
196310b250
Ahem, libmenu objects should only be compiled when OSD menu is enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26391 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 08:18:28 +00:00
5948bebaf8
vf_pp7 does not depend on libavcodec.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26390 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 08:13:36 +00:00
5e8800e052
vf_screenshot depends on libavcodec.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26389 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 08:11:16 +00:00
7a4e96783d
Remove unused TARGET_WIN32 setting.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26388 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 07:39:49 +00:00
293e11bc0f
Remove Win32 linker option for netstream. Other winsock using code does not
...
need it, it should be set from configure and the reason why it was set in
the first place has been lost in the mists of time.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26387 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 07:37:27 +00:00
0e2ecd39c5
Add a config.mak variable to control compilation of the Win32 GUI.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26386 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 07:28:32 +00:00
137ff809f9
Remove unused definition.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26385 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 07:17:40 +00:00
97624c29f8
Support for vorbis.acm decoder (used for some implementations of vorbis
...
in avi)
Patch by Zuxy Meng ||| zuxy meng gmail |||
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26384 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-10 21:01:53 +00:00
14ad1adcf3
if it's 'for lang in...' it's better off to use $$lang as a variable next ;)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26383 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-10 10:55:39 +00:00
5910188a5e
Fix illegal identifier: Rename _ftype_t macro to FLOAT_TYPE.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26382 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-10 10:01:54 +00:00
2a1bc4f6ec
1000l fix linking after r26378
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26381 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 21:49:27 +00:00
624f8ca8e9
document ignore option
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26380 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 20:53:11 +00:00
b2f9633eab
10l: libass compilation should be conditional.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26379 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:33:26 +00:00
2f4381fffd
Rename ASS make variable to LIBASS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26378 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:26:44 +00:00
1e18468ce0
Remove useless #include.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26377 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:20:22 +00:00
dc8d47d1eb
Merge libaf/Makefile into Makefile, one less instance of recursive make.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26376 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:15:21 +00:00
f8b6baa57e
Remove some useless quotes from #error preprocessor directives.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26375 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:05:57 +00:00
6ae33bc013
Use quotes instead of angular brackets for local includes.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26374 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 18:02:05 +00:00
0ce6d08a83
Handle af_ladspa conditional compilation in the usual way.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:23:59 +00:00
27d308ae44
Remove -I CFLAGS hack, -I../libavcodec is no longer in CFLAGS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26372 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:14:43 +00:00
24ce48897e
Do not build subrip with debugging symbols.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26371 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:03:08 +00:00
4eea61ddb3
cosmetics: Group dependency declarations together.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26370 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:02:22 +00:00
2c6ac409a5
Remove redundant compilation commands that shadow builtin rules.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26369 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 17:00:42 +00:00
47a0430fea
List libraries to link to in dependency list.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26368 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 16:54:49 +00:00
58983c3d2e
cosmetics: Add CFLAGS to compilation commands everywhere.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26367 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 16:50:30 +00:00
e74dfd1bd1
Remove unnecessary ../libmpcodecs/img_format.o from list subrip objects.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26366 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 16:42:18 +00:00
ad908d5198
Update for latest changes to linking dependencies.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26365 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 16:39:07 +00:00
4bcb2a5baf
Add missing #includes to pass 'make checkheaders' to codecs.conf.h.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26364 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 15:19:55 +00:00
7bba082cb0
Restore osdep/mmap-os2.c compilation, which was accidentally removed.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26363 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 14:13:30 +00:00
34db110473
cosmetics: Align columns.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26362 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 12:54:07 +00:00
72cc06352f
Fix nonsensical license header, mpeg2dec is not GNU Make.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26361 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 11:31:50 +00:00
698142597e
Split the lavf taglists out of the lavf muxer to allow using libmpmux
...
without libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26360 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:46:21 +00:00
0359e6ddfb
Split the aac header parsing out of aac demuxer to allow using libmpmux
...
without libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26359 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:43:19 +00:00
f481e7870b
Remove the need for code using stream to export an mp_input_check_interrupt()
...
function. It also removes the compile-time dependency on input.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26358 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:36:28 +00:00
64868a36cd
Make stream independent of libmpdemux, the asf demuxer and streaming
...
code share a function and a few definitions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26357 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:32:35 +00:00
32824f5eca
Merge libass/Makefile into Makefile, one less recursive make directory.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26356 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:25:59 +00:00
36d1b39c9e
cosmetics: Rename some shell variables to give them more descriptive names.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26355 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:11:17 +00:00
c4a51ba068
cosmetics: Merge shell commands into one line.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26354 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:08:23 +00:00
fa4f36202e
Do not suppress command output.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26353 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 22:07:03 +00:00
ff191b8495
Merge osdep/Makefile into the top-level Makefile, thus getting rid
...
of recursive make in the osdep/ subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26352 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 18:25:30 +00:00
2abdcd86d9
Move decision about which getch2 and timer file to compile to configure.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26351 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 18:03:14 +00:00
e2c560a9f6
Move decision about whether or not to compile osdep/mmap_os2.c to configure.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26350 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 17:31:25 +00:00
ae75174784
Merge simplifications from FFmpeg r12764.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26349 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-08 17:06:25 +00:00
4022a072f0
Fix FFmpeg DEPEND_CMD to account for latest changes and add MPDEPEND_CMD.
...
MPlayer needs a slightly modified incantation due to different levels
of Makefile indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26348 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 23:49:39 +00:00
18f2d95890
Sync with FFmpeg's shiny new non-recursive build system.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26347 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 22:25:13 +00:00
ac1280459b
non-recursive makefiles
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26346 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 21:16:50 +00:00
9623100d13
reset() should not senselessly close and reopen
...
the device but instead just call flush_audio()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26345 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 17:39:41 +00:00
885709eadd
AUDIO_DRAIN makes no sense directly after opening
...
the device, but it should be done in uninit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26344 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 17:32:44 +00:00
f827599b48
Build all parts in the libmenu subdirectory nonrecursively.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26343 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 08:28:54 +00:00
diego
rtogni
ptt
compn
albeu
mru
reimar