Commit Graph
23572 Commits
Author SHA1 Message Date
uau 4c1b6e248a Fix demuxer.h multiple inclusion guard
The "#ifndef __DEMUXER_H" / "#endif" pair did not cover the whole file.
Move the #endif to the last line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23591 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-20 16:52:32 +00:00
reimar 8eeb449d58 Remove useless demnuxer.h include from matroska.h, it creats "hundreds" of
"warning: redundant redeclaration"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23590 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-20 16:29:56 +00:00
cehoyos 634dfcbed7 Simplify network timeout calculation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23589 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-20 10:39:57 +00:00
zuxy be09bd1c04 The audio balance feature implemented with af_pan.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23588 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-20 02:26:20 +00:00
compn d5621cf639 some more reqs from users
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23587 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-19 23:24:04 +00:00
reimar f0a5c4a73c Simplify generation of CPU-extensions HAVE_ and ENABLE_ defines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23586 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-19 13:55:22 +00:00
reimar 45f1935fd3 Simplify generation of ARCH_ and corresponding ENABLE_ defines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23585 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-19 13:55:12 +00:00
reimar 38a9c8ff7a Add an optional third parameter to ff_config_enable in preparation
of next patches (allows to define e.g. ARCH_ instead of CONFIG_).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23584 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-19 13:54:48 +00:00
reimar ba99ef4655 Allow to disable x86 cpu extensions (e.g, via --disable-sse) even with
runtime cpudetection.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23583 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-19 13:37:31 +00:00
gpoirier 459904d825 fix typos noted by Nicolas Legrand
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23582 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-19 13:24:16 +00:00
diego d33738a85c Port changes for older Subversion releases from FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23581 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-19 06:51:33 +00:00
diego 0c4c7a4263 misc small fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23580 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 21:24:45 +00:00
diego adc90cf075 Activate license notice.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23579 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 20:04:46 +00:00
diego bc5471c029 Fix license header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23578 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 19:31:17 +00:00
ptt 907a9d077d they said 'colla' was cacophonic.... probably indeed it was :) changed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23577 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 14:44:41 +00:00
ptt f45216a868 synced with r21930
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23576 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 10:44:35 +00:00
cehoyos 5763ed69ac Silence three warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23575 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 09:15:32 +00:00
cehoyos ed522600d8 Stop playing at eof or if no data arrives for ten seconds.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23574 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 08:53:53 +00:00
gpoirier fa78291f12 sync w/ r23561
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23573 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 08:02:37 +00:00
zuxy 276394a205 More accurate seeking for demuxers lacking DEMUXER_CTRL_GET_TIME_LENGTH control
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23572 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 13:28:52 +00:00
zuxy 6e6d3acfa9 Add AF_CONTROL_PAN_BALANCE control
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23571 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 12:18:13 +00:00
reimar 2c1ee29835 Set subtitle type in mpg demuxer. Fixes subtitle switching with 'j'
(previously subtitles would just disappear).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23570 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 10:24:10 +00:00
reimar eb6179a168 Merge (trivial) dvdnav and dvdread subtitle selection code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23569 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 08:29:26 +00:00
reimar b6e735fde1 Make sure we do not access demuxer->s_streams out of bounds
when invalid -sid is given


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23568 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 08:26:07 +00:00
uau 90f1c3cc92 Remove broken option reset from per-file loop
When -loop is used as a per-file option it seeks back to the start of
the file from the end and tries to reset options to their original
values. This reset is not implemented properly: it simply sets the
option variables back without running any of the associated control
code. Implementing the option reset functionality properly would be a
significant amount of work and there is no clear need for it, so I'm
simply removing the broken version.

None of this affects the use of -loop as a global option. That case has
a separate implementation which always starts a new file from scratch
with default option values.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23567 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-16 19:47:36 +00:00
rtogni ad543c7328 Compilation fix: define some ENABLE needed by lavc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23566 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-16 16:07:02 +00:00
reimar 410892a5c1 Add HAVE_ Makefile variables needed by ffmpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23565 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-16 15:32:54 +00:00
reimar b6807dadb3 Missing libswscale part of TARGET_ -> HAVE_ change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23564 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-16 15:29:26 +00:00
reimar 1064982ff8 Follow ffmpeg TARGET_ARCH_* -> ARCH_* change.
Feel free to revert if you do not like it, but I want to get MPlayer to compile again.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23563 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-16 15:24:39 +00:00
reimar f591c3a74d Copile fix: missing libswscale part of ffmpeg r9322 TARGET_ARCH -> ARCH change.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23562 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-16 15:17:00 +00:00
gpoirier 6efcd75290 add missing IDCT algothim, as defined in libavcodec/avcodec.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23561 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-16 11:49:11 +00:00
eugeni 387ccdc034 When parsing ass-force-style arguments, search for '=' and '.' characters with
strrchr. This allows using it for styles whose name contains those characters.
Patch by Бранко Мајић <branko majic at gmail com>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23560 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-15 22:22:16 +00:00
eugeni 34402c3cf2 Make sure there is at least one style in ass_track when parsing events.
Before it was only checked for embedded subtitles.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23559 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-15 22:15:27 +00:00
ptt d95be058ad synced with r23536
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23558 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-15 14:38:12 +00:00
compn df878adea6 update wishlist
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23557 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-15 11:59:14 +00:00
diego 7b472fa2ea misc spelling fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23556 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-13 17:48:15 +00:00
cehoyos 08054925cc Do not allow to compile gui without PNG decoder in libavcodec.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23555 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-13 11:04:01 +00:00
ptt 3133f9099b grammatical error fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23554 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-13 10:50:14 +00:00
zuxy 173c051b76 Remove incorrect comment: pan defaults to block all, instead of pass-thru.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23553 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-13 09:29:51 +00:00
zuxy c91cce5812 Avoid zero output for pan filter; zero output now means same # of channels
as input. Make pan work for af_add().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23552 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-13 09:28:49 +00:00
zuxy fd6d47944e Make pan reentrant. Multiple pans in chain work fine.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23551 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-13 09:20:36 +00:00
nicodvb e2ed3cb72d clearly specify the valid substream id range, rather than using unreadable bitmasks (it also prevents misdetection 0xFF as valid)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23550 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-12 22:08:30 +00:00
gpoirier d04d9b3c95 refine the example of -menu-chroot yet more
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23549 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-12 20:31:49 +00:00
gpoirier 3dd5f316fb give an example of -menu-chroot usage
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23548 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-12 20:16:51 +00:00
ptt 97b235c6cb little corrections suggested by nico sabbi , thanx
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23547 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-12 09:14:46 +00:00
cehoyos 2c1d737ff7 Fix compilation after FFmpeg r9283.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23546 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-12 08:38:42 +00:00
voroshil 1febb0fa87 r23516: little indentation fix
r23517: small indentation and tags fixes
r23520: reversed previus modification (r23517)
r23536: caps character after "Explanation:" in tvinput.xml
r23537: <note><para> indentation corrected
r23538: capital char and relative dot at end of phrase removed


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23545 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-11 07:39:06 +00:00
diego 17722f1e6c Sync with FFmpeg r9278.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23544 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 22:20:24 +00:00
lu_zero 9c5ce32cad avoid utter breakage on non-x86, patch from Chris Roccati <roccati@[email protected]>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23543 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 21:58:30 +00:00
ptt d2ef110c8a yes, interleave was deeply wrong translated. corrected
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23542 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 19:19:00 +00:00