Commit Graph

23601 Commits

Author SHA1 Message Date
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@at@pobox.dot.com>
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
ptt a30b14fb44 changed forgotten $Revision... to synced with.... sorry :(
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23541 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 18:36:30 +00:00
ptt 9d543c9eeb small grammar fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23540 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 18:33:36 +00:00
ptt a464029212 removed a forgotten part in english plus small corrections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23539 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 18:24:34 +00:00
ptt 47a0c3b9eb capital char and relative dot at end of phrase removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23538 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 17:58:53 +00:00
ptt a01c491a85 <note><para> indentation corrected
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23537 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 17:53:34 +00:00
ptt ee411b7dc7 caps character after "Explanation:" in tvinput.xml
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23536 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 17:49:43 +00:00
ptt fe8b65fae8 added italian translation of codecs.xml & containers.xml
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23535 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 17:47:15 +00:00
aurel 08e5dd0793 Don't set random codec parameters for AC3/DTS in mkv.
Those values are not needed anyway.
This fixes stream copying from mkv with mencoder.
Patch by Trent Piepho.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23534 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 16:45:30 +00:00
Gabrov 374ae16491 synced with r23531
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23533 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 10:05:54 +00:00
gpoirier 7f5696f67d sync w/r23530
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23532 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 10:00:05 +00:00
nicodvb 6099913ed0 removed functions that were used to parse mpeg12 video (no more video); patch by John Donaghy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23531 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 09:25:09 +00:00
voroshil 83a2c50ef9 Teletext support for tv:// (v4l and v4l2 only)
modified patch from Otvos Attila oattila at chello dot hu

Module uses zvbi library for all low-level  VBI operations (like I/O with vbi
device, converting vbi pages into usefull vbi_page stuctures, rendering them
into RGB32 images).

All teletext related stuff (except properties, slave commands and rendering
osd in text mode or RGB32 rendered teletext pages in spu mode) is implemented
in tvi_vbi.c

New properties:
teletext_page - switching between pages
teletext_mode - switch between on/off/opaque/transparent modes
teletext_format - (currently read-only) allows to get format info
(black/white,gray,text)
teletext_half_page - trivial zooming (displaying top/bottom half of teletext
page)

New slave commands:
teletext_add_dec - user interface for jumping to any page by editing page number
interactively
teletext_go_link - goes though links, specified on current page



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23530 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-10 00:06:12 +00:00
nicodvb 990b33b1c2 init ts_probe to 0 and probe up to TS_MAX_PROBE_SIZE if the parameter
is not explicitly set by the user;
make the code that checks audio-only stream files respect -tsprobe 



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23529 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-09 18:20:21 +00:00
lorenm c263afa4af x264 no longer defaults to qp=26.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23528 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-09 17:32:49 +00:00
nicodvb 90a8abd89c added support for DTS1 audio descriptor
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23527 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-09 11:57:22 +00:00
nicodvb 3c4127353a 1000000l, descriptor VC-1 identifies VIDEO_VC1, not AUDIO_DTS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23526 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-09 11:56:10 +00:00
henry 0f85b371fd set the window aspect hint
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23525 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-09 09:25:41 +00:00
compn c3e61295b6 add mmes fourcc for mpeg2 in avi files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23524 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-08 22:59:04 +00:00
cehoyos 5b21eb0177 Simplify addition of -Wdeclaration-after-statement to CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23523 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-08 22:22:50 +00:00
cehoyos dbe1e3f2ea Support icc 10.0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23522 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-08 22:04:09 +00:00
gpoirier d9a4093d90 sync w/r23504
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23521 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-08 20:24:56 +00:00