Commit Graph

26423 Commits

Author SHA1 Message Date
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
compn 6ee17da379 add switch_aspect cycle wish
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26324 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-04 01:24:40 +00:00
iive 2ae2955f09 Change I_TYPE -> FF_I_TYPE to fix compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26323 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-04 01:09:36 +00:00
reimar 9761bde49c Change I_TYPE -> FF_I_TYPE to fix compilation.
The whole functionality should probably be used to libavcodec though.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26322 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-03 17:19:23 +00:00
reimar 58054ed4a0 Better mark variables that are changed by the signal handler as volatile
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26321 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-03 16:57:16 +00:00
uau 12ff2d2644 Add some const qualifiers to reduce warnings
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26320 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-02 01:01:22 +00:00
diego 63f2517dd2 Remove now useless PARTS-yes line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26319 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 22:00:54 +00:00
diego 54ea438edf Darwin and Win32 DVD support libs are handled separately, take them back
out of the combined system and DVD header test in the dvdread check.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26318 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 21:59:39 +00:00
diego a414eba619 Initialize _dvdread variable to "no" in the dvdread check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26317 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 21:22:02 +00:00
diego 5e1f250543 Remove pointless comments from local diff.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26316 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 17:42:16 +00:00
diego 01490fe993 cosmetics: Fix some typos and trailing whitespace in local changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26315 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 17:41:18 +00:00
diego 01eb667a55 Revert local changes that pointlessly add #ifdefs all over libmpeg2 to disable
code depending on CPU capabilities. Instead, rely on libmpeg2's builtin CPU
capability handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26314 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 17:31:37 +00:00
uau 99901138ab Remove unnecessary includes
command.c: Don't include libmpcodecs/mp_image.h, libmpdemux/matroska.h
mplayer.c: Don't include libmpdemux/matroska.h
matroska.h: Remove declaration of already removed function
            demux_mkv_change_subs and stop including demuxer.h


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26313 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 15:24:53 +00:00
diego c32f706c96 Do not #include libavutil/common.h. It is not used directly and mpbswap.h
now #includes all required headers on its own.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26312 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 14:19:45 +00:00
diego 228b36b9b3 Ahem, fix quoting of $ in DEPEND_CMD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26311 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-31 17:48:50 +00:00
diego adc9ef3107 Add DEPEND_CMD to config.mak (sync with FFmpeg).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26310 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-31 17:27:01 +00:00
diego 8697a8148d Rename HAVE_XVMC_ACCEL to HAVE_XVMC for consistency and to sync with FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26309 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-31 17:19:51 +00:00
diego 073786ee4f cosmetics: Group all FFmpeg settings together in config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26308 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-31 17:04:06 +00:00
diego ff3609fb9b HAVE_MLIB was renamed to CONFIG_MLIB in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26307 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-31 16:53:14 +00:00
diego 5d3fa363cc We currently use %U as argument to the Exec entry to indicate that gmplayer
handles URLs. However, gmplayer fails to open files with spaces in the
filename when launched from a file manager in this way. Changing %U to %F
works around this issue successfully while still working with URLs.
While this may not be a completely satisfactory solution, it is already
deployed in distributions and a better solution is unlikely to appear.
patch by Andrew Strong, andrew.david.45 gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26306 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-31 16:20:08 +00:00
uau 2b2792565e command.h: Remove unnecessary includes
Remove #include of "mp_core.h" and "input/input.h". Their only use was
that functions declared in command.h took pointers to structs defined
in those headers. Declare the structs directly as incomplete types
instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26305 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-31 04:10:54 +00:00