Commit Graph

26283 Commits

Author SHA1 Message Date
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
uau e3a29a7f4e mp_core.h: Fix use of 'mp_image_t' without definition
A field under #ifdef USE_DVDNAV had type "mp_image_t *', but a
definition of the type was not included. Fix by changing the type to
"struct mp_image_s *".

This probably started causing visible compilation failures after
'#include "command.h"' was added to command.c, as that led to
mp_core.h being included earlier.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26304 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-31 04:10:51 +00:00
eugeni 3a1a54fab4 Case insensitive parsing of SSA/ASS section headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26303 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-30 17:42:19 +00:00
eugeni 994b2022c3 Skip BOM at the beginning of text in ASS parser.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26302 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-30 17:42:17 +00:00
eugeni 7cc46c2e87 Support 'default' attribute for audio and subtitle tracks.
The first default track is chosen for playback if language-based selection
failes. Additionally, for audio tracks, the first one is chosen if there are
no default tracks at all.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26301 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-30 16:55:46 +00:00
diego 37d20cbc93 Fix wrong #endif comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26300 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-29 15:51:05 +00:00
reimar 54c48f18a1 Fix possible integer overflow in malloc by using calloc instead.
Should fix CVE-2008-0073 as far as MPlayer is affected by this problem.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26299 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-29 11:35:29 +00:00
ptt 33dc71664e synced with r26297
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26298 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-28 14:02:53 +00:00
ptt 36c0e7d7ac compacted new libavformat's 'ipod' description
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26297 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-28 13:59:58 +00:00
reimar 57521c3467 Handle property commands in idle mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26296 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-28 08:30:53 +00:00
uau 03bb309e4e Include some .h files in corresponding .c files
Include the corresponding .h file in command.c, parser-cfg.c and
parser-mpcmd.c. This allows the compiler to check that the
declarations in the .h file match the actual defition.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26295 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-28 01:07:59 +00:00
ptt 35717c8ec7 synced with r26073
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26294 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 19:58:00 +00:00
ptt 146247d149 it's synced with r23520
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26293 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 19:48:06 +00:00
ptt 10b5d21b5b it's synced with r26258
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26292 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 19:44:30 +00:00
ptt bf248264f5 it's synced with r24035
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26291 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 19:36:48 +00:00
ptt 556abf52d6 it's synced with r25566
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26290 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 19:35:13 +00:00
ptt a03a58e43b it's synced with 26146
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26289 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 19:33:54 +00:00
ptt 6e1cf9f457 synced with 23516 (it was already ok)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26288 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 19:32:05 +00:00
ptt dcc6c89a18 remove excessive space character
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26287 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 19:21:43 +00:00
ptt e22d45c996 grammar fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26286 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 19:10:00 +00:00
ptt 244014f2a6 38% synced with r22753
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26285 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 18:38:38 +00:00
diego 568fb38cda cosmetics: prettyprinting
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26284 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 11:19:11 +00:00
diego bd3b8d278a some more DragonFly BSD changes, patch by Hasso Tepper, hasso estpak ee
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26283 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 11:18:09 +00:00
ptt 953cca5a5f better explanation and grammar fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26282 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 08:42:09 +00:00
ptt 771863e035 grammar fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26281 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 08:29:04 +00:00
diego 5420e79056 support for DragonFly BSD, patch by Hasso Tepper, hasso estpak ee
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26280 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 02:04:03 +00:00
diego 5a5acd6b1f Remove bsd() system check. Lumping different *BSD systems together like
that was not a good idea in the first place. They are too different and
constantly diverging.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26279 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-27 01:56:37 +00:00
diego c9bd9a617a sync with FFmpeg r12599
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26278 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-26 09:58:37 +00:00
diego 0383a49a67 cosmetics: Reindent X11 header search section after last commit.
patch by Guillaume Lecerf, foxcore gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26277 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-26 00:15:43 +00:00
diego 27ffcb5802 Do not look for X11 headers on the host when cross-compiling.
patch by Guillaume Lecerf, foxcore gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26276 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-26 00:14:51 +00:00
diego ebfa5122b3 Classify mlib as a configurable option, not as a hardware feature.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26275 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-25 21:30:46 +00:00
ptt 8740ba4b47 synced with r26271
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26274 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-25 18:51:33 +00:00
gpoirier 2bd5dda30b add "ipod" to the list of formats handled by lavf
Patch by Mark Himsley %mark A mdsh P com%


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26273 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-25 16:07:57 +00:00
diego ebcd242a56 Add FFmpeg Mimic decoder.
patch by Ramiro Polla, ramiro lisha ufsc br


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26272 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-25 09:11:20 +00:00
diego a7228bb324 Mention that '-frames 0' is useful with -identify, closes bug #1046.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26271 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-24 10:58:07 +00:00
diego b090190936 Fix 64 bit shared library compilation with MMX2 by properly using PIC mangling.
patch by Alexander Strange, astrange ithinksw com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26270 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-22 18:22:53 +00:00
diego cf09f76844 cosmetics: comment typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26269 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-22 17:35:32 +00:00
ptt 0aed3b7205 better wording
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26268 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-21 19:16:44 +00:00
compn 97aee4bdd8 add complete fifo instructions, user didnt know to use mkfifo first.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26267 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-21 19:05:12 +00:00
reimar 6b1453c615 Ignore if we fail to get disc key, fixes playback of one of my DVDs which
claims to be scrambled but actually is not, and always allows to
fallback to cached keys.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26266 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-21 12:31:47 +00:00
ptt b5b68ca4ab synced with r26260
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26265 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-19 15:46:37 +00:00