Commit Graph

26343 Commits

Author SHA1 Message Date
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
albeu 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
albeu 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
albeu 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
albeu 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
diego 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
mru 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
reimar 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
reimar 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
diego 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 2d9e8beafd There is no more need to ignore .depend and libinput.a.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26342 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 07:55:05 +00:00
diego 68ebb980cb According to the Icon Theme Specification icon names should have no extension.
Compare the output of new versions of desktop-file-validate.
pointed out by giggz, giggzounet gmail com, in Debian bug #472833.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26341 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-07 07:46:32 +00:00
diego c9b0ef9bca Get rid of recursive make for the input/ subdirectory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26340 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 23:09:06 +00:00
diego 9087c4270b Update Makefile to account for native/RTjpegN.c --> native/rtjpegn.c renaming.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26339 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 23:08:15 +00:00
diego 8109559bf8 Use DEPEND_CMD as set by configure to generate dependency information instead
of hardcoding a gcc-specific command. This also fixes dependency generation
for files in subdirectories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26338 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 21:56:11 +00:00
diego 730bff7914 100l: Revert previous accidental commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26337 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 21:52:50 +00:00
diego f4d87d3e88 Rename RTJPEG files so that filenames consist of lowercase name only.
Parts of the build system assume lowercase-only filenames.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26336 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 18:17:59 +00:00
compn 37235a414c add dvcpro 50 in mov fourcc, patch by j _ta_ v2v.cc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26335 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 13:38:46 +00:00
Gabrov e0eb1592f2 synced with r26333
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26334 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 19:33:05 +00:00
diego 84376fec0b Add multiple inclusion guards to help_mp.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26333 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 16:29:10 +00:00
diego 6be4482804 Use the more natural ">" instead of "1>" for stdout redirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26332 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 16:19:10 +00:00
reimar 02fe2aae9f Fix lots and lots of other demuxers broken by r26301
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26331 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 14:11:48 +00:00
reimar 42234b5198 Remove another useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26330 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 14:07:34 +00:00
reimar 2ff97b7e85 Remove useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26329 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 14:07:05 +00:00
reimar af654481c0 Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder
and also will create proper files when remuxing into e.g. AVI.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26328 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 11:09:21 +00:00
reimar e826cc2d72 Set demuxer->audio->id to avoid breakage due to r26301
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26327 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 09:19:55 +00:00
reimar 75535bba65 Set correct codec tag for raw rgb in mov, fixes
http://samples.mplayerhq.hu/mov/rawbgr24.mov


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26326 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 08:49:07 +00:00
diego e20c28296b Export some more information for FFmpeg's buid system.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26325 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-04 19:38:06 +00:00