Commit Graph

47 Commits

Author SHA1 Message Date
reimar 8e7945155c Use libavutil's av_clip* instead of unreadable MIN/MAX chaos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22395 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-01 12:54:08 +00:00
reimar 0ba390c7a3 Open vobsub output files in binary mode, otherwise the OS might
do all kinds of evil mangling to them (fixes bug #668).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21460 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 11:23:04 +00:00
reimar e0892295b5 Useless initialization, they will be always set for result != 0
and for result == 0 they make no sense


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20102 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 09:05:27 +00:00
reynaldo a814f0ebcd removes unused parentheses lefted behind in the r19075 sizeof(char) cleanups, noticed by dalias
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19079 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-14 06:26:31 +00:00
reynaldo 26f0e5e4a1 more sizeof(char) fun
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19075 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 22:11:47 +00:00
reynaldo 3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 07:20:34 +00:00
faust3 06f0cd6893 avoid conflicting types error on cygwin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17528 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-02 12:01:40 +00:00
reimar f8b41e9052 fix memleak in idx parser. patch by elupus [elupus {at] ecce <dot) se]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14238 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-25 12:08:33 +00:00
mosu 50a86fcc34 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-25 22:24:00 +00:00
luran e3f069bf7a fix the crash when seek with 'unknown' subtitles, hopefully...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11710 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-01 11:01:09 +00:00
nexus 9d3d9aa34a fix typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11696 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-28 00:43:21 +00:00
alex c7f47f1837 10l found by atmos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11595 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 21:53:54 +00:00
alex 0955d23934 vobsub seeking support by Lu Ran
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11590 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 18:35:39 +00:00
mosu 7931d804f1 Improved searching for VobSubs inside RAR archives even if the names do not match the movie name. Do not display VobSubs whose timecodes are < 0 which would make all VobSubs appear from the start on upon seeking. Patches by "Reder, Uwe" <Uwe.Reder@3SOFT.de>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11310 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-28 22:36:56 +00:00
attila 943904865f Forced subtitles patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
For a given subtitle language you can now chose to display
  only the forced subtitles. Defaut is set to "show all subtitles"
  so that current mplayer behaviour is not changed.

For DVD:
  Use -forced_subs_only additionally to e.g. -slang en
  if you are only interested in the forced subtitles.

For VobSub:
  The idx file is now parsed for the "forced subs: ON/OFF" tag
   and used according to its settings.

Key:
  You can toggle the display of forced subtitles by pressing
   "F"  (upper case letter).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10918 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-21 14:21:43 +00:00
faust3 c14bc5bbc0 binary flag is rquired for win32
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10894 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-20 19:41:24 +00:00
alex 078776801b 10l, lot of missing new-lines. In case of an error, all the messages will be screwed up
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10759 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-31 22:36:27 +00:00
faust3 e0c59923ec remove ssize_t mess
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10211 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-30 17:38:51 +00:00
faust3 a66cc22948 MINGW32 port
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9773 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-31 17:32:46 +00:00
kmkaplan 727d41286f supdec.h needs libvo/video_out.h. vobsub.c does not.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9512 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-28 19:21:45 +00:00
kmkaplan a543af3a40 warning fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9510 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-28 08:17:54 +00:00
arpi c11bd13ed6 compiler warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8734 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-03 12:26:17 +00:00
arpi 8457972ae4 Here is the patch to make vobsub subtitle use -slang option, I have not made a
new option for vobsub. Now mplayer will use the setting of slang first, and
then langidx from .idx file, if all failed, no sub.
patch by hephooey@fastmail.fm


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8536 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-23 01:54:58 +00:00
arpi 28538fd920 When you called mplayer with the absolute path to the video and the VOBSUB
subtitle is in a rar archive, mplayer tried to find the files in the archive
with the absolute path. The patch fixes the problem by getting rid of the
full path just trying the filename.
patch by Uwe.Reder@3SOFT.de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8204 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-16 03:04:33 +00:00
arpi 39fe4d0cd3 verbose can be negative
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-01 17:46:45 +00:00
arpi 020da6d76e The first language ripped is set as the default language
by writing the langidx tag with the index of this language.
patch by Arne Driescher <driescher@mpi-magdeburg.mpg.de>
(accepted by Kim Minh Kaplan)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8015 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-01 00:01:53 +00:00
kmkaplan 43ef114abe Mplayer can switch between subtitles of different languages during
playing by press 'j', based on a patch by <hephooey@fastmail.fm>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7781 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 15:44:41 +00:00
kmkaplan 1637590528 Automatic unrar of vobsub. Does not work with rar v3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7447 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-20 01:26:39 +00:00
kmkaplan 14b3eae4b1 Fix support for negative "delay:" directive in .idx file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7418 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-16 15:31:34 +00:00
kmkaplan 574cd16de4 Use RGB for palette from .IDX file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6832 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-28 16:37:05 +00:00
kmkaplan 599cf07dc3 New function vobsub_get_next_packet for subrip.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6830 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-28 16:28:30 +00:00
atmos4 93c6b5610a Make vobsub palette generation compatible with windows vobsub.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6828 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-28 12:01:32 +00:00
kmkaplan b58bc9dd26 Remove depency on libmpdemux streams, use ANSI IO instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6774 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-23 20:19:42 +00:00
kmkaplan f36c4b065b Lots of compatibility fixes for Windows' Vobsub reader.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6707 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-11 18:49:18 +00:00
atmos4 f1a69972e9 MEncoder vobsub ripping support, currently not compatible with windows vobsub, some bugs to be fixed. However it already works with mplayer, so it's a start.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6675 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-08 21:44:51 +00:00
alex cdfc03fab6 applied 64bit patch from Ulrich Hecht <uli at suse dot de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6164 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-23 15:27:49 +00:00
albeu 7562937d95 Improvment for spu subtitles.
Removed the integreted spudec in vobsub.
Various cleanup/bugfix in vobsub (no more auto palette when a true one is
here)
HW spu rendering moved in spudec because we first need to reassable the
packet before sending them to the hw.
Spudec is now created only if nedded.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6111 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-17 23:47:27 +00:00
atmos4 67a78be408 Avoid bogus file not found message if vobsub isn'T forced (autodetect).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5870 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-27 20:46:39 +00:00
atmos4 951c9b7806 Fix bug in LR's patch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5840 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-26 15:48:18 +00:00
atmos4 c8574dca48 VobSub updates, custom palette support and other stuff, can't write the name of the chinese(?) patch supplier.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5834 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-25 18:46:44 +00:00
atmos4 050c4bc9ad Sorry, fix vobsub duration the arpi way.
Also added origin parsing, those values are to adjust subtitle placement, they should be added to start_row and end_row and start_col and end_col, but haven't yet found the proper place to hook them in.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5564 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-11 16:50:52 +00:00
kmkaplan 4d38521e2c * New command line switch for mplayer & mencoder:
-ifo <ifo file>

	Indicate the file that will be used to load palette and frame size
	for MPEG subtitles.

* mencoder.c:

    Fix cropping when decoding MPEG2.

* spudec.c:

    If scaling is needed only do it once.

    Change WITH_NO_ANTIALIASING to ANTIALIASING_ALGORITHM.

* vobsub.c:

    Support reading info regarding size and palette from IDX file instead of IFO file.

    Support streams containing audio or video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5389 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-29 03:17:57 +00:00
atmos4 ea1d758009 Fix automatic vobsub detection and make it silent.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4788 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-21 15:44:51 +00:00
atmos4 49a76c3a0d forgot to commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4787 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-21 14:34:52 +00:00
kmkaplan ce183a3fd0 Check for NULL vob->spudec before using.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4115 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-12 18:34:50 +00:00
kmkaplan 9cd9d5c3d0 Support vobsub without index files.
Fix off by one bug.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4086 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-10 20:12:12 +00:00
kmkaplan 1b6e300d94 Add vobsub support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4081 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-10 17:20:27 +00:00