RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-29 15:00:27 +00:00
Code Issues Releases Wiki Activity
32,845 Commits 43 Branches 87 Tags 168 MiB
6506d4ad84
Commit Graph

104 Commits

Author SHA1 Message Date
Uoti Urpala
85f4633796 demux_ty: disable -subcc functionality (demux_ty_osd) 
Disable compilation of demux_ty_osd.c because of its GPL v2-only
license. This only affects TiVo files with -subcc. After this no
v2-only code should get compiled (yuv4mpeg_intern.h has a v2-only
license, but the contents of the header look like they're not
copyrightable).
 2011-03-24 22:23:12 +02:00
Uoti Urpala
f50f34245e Merge branch 'sub' 
* sub:
  sub/OSD: move some related files to sub/
  subtitles: options: enable -ass by default
  subtitles: change default libass rendering style
  demux_mkv, chapters: change millisecond arithmetic to ns
  cleanup: rename ass_* functions to mp_ass_*
  subs: use correct font aspect ratio for libass + converted subs
  cleanup: some random minor code simplification and cleanup
  vf_vo: fix EOSD change detection bug
  sd_ass: remove subreader use, support plaintext markup
  subtitles: style support for common SubRip tags and MicroDVD
  core: ordered chapters: fix bad subtitle parameter
  subs/demux: don't try to enable sub track when creating it
  subtitles/demux: store duration instead of endpts in demux packets
  subtitles: add framework for subtitle decoders
  options: add special -leak-report option
  subtitles: remove code trying to handle text subs with libavcodec
  cleanup: move MP_NOPTS_VALUE definition to mpcommon.h
  subtitles: move global ass_track to struct osd_state
  core: move most mpcommon.c contents to mplayer.c
  core: move global "subdata" and "vo_sub_last" to mpctx
  subtitles: remove sub_last_pts hack
  options: move -noconfig to option struct, simplify
 2011-01-26 20:42:15 +02:00
Uoti Urpala
c9026cb321 sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
Uoti Urpala
75c394df8f demux_ty: fix "seek to negative position" warning 
demux_ty relied on demuxer->filepos being initially set to 0, but
demuxer.c has been changed to initialize it to -1. This caused a
"Invalid seek to negative position!" error message when running the
demux_ty file format check (so it occurred for any file which had not
been recognized as another type before that). Fix by making demux_ty
initialize filepos to 0.
 2011-01-21 23:07:57 +02:00
diego
1de42d8c64 demux_[mpg|ts|ty]: #include dec_audio.h for skip_audio_frame() 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32431 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:18:08 +02:00
reimar
531964aa8d demux_ty: Cleanup some code, possibly fix vstream support (untested) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31423 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-11-02 04:10:10 +02:00
Uoti Urpala
00323c06e2 Delete things related to old translation system 
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
 2010-03-10 03:47:14 +02:00
Uoti Urpala
c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala
b34a88e4f4 translations: tweak cases that relied on concatenating adjacent strings 
Tweak some code parts that used to rely on string literals from
translation macros being concatenated with other adjacent string
literals. Break up the resulting string into independently translated
parts, so that the existing translations for those parts can still be
used.
 2010-03-07 21:35:23 +02:00
diego
c66aa21366 Add header for ty_ClearOSD(), ty_processuserdata(); avoids forward declarations. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30619 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-17 22:48:32 +00:00
Uoti Urpala
5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
reimar
d1a2c82198 Move 128kB buffer from stack to demuxer context. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29940 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-20 23:48:16 +00:00
Uoti Urpala
d6c410b54c Replace libavutil internal header #includes with MPlayer copies 
Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h
and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/
instead.
 2009-07-26 06:16:43 +03:00
Amar Takhar
e306174952 Translation system changes part 2: replace macros by strings 
Replace all MSGTR_ macros in the source by the corresponding English
string.
 2009-07-07 01:38:20 +03:00
Amar Takhar
b5972d6f14 Translation system changes part 1: wrap translated strings 
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
 2009-07-07 01:28:07 +03:00
diego
0864f92e7a Get rid of pointless 'extern' keywords. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 23:01:03 +00:00
diego
4adf8975a1 Use standard license headers with standard formatting. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26774 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-14 18:01:51 +00:00
reimar
5960ddb8e5 Use defines to give names to the different seek flags. 
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-29 15:11:38 +00:00
reimar
35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-01-13 16:00:39 +00:00
reimar
544a306147 Avoid one more code duplication 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24527 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 13:25:56 +00:00
reimar
b03ca2821f get rid of pointless size parameter for tmf_load_chunk 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24526 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 12:13:45 +00:00
reimar
40f7ef2fb5 Avoid using demux->stream->end_pos, it rarely does any good. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24525 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 11:56:24 +00:00
reimar
5ea0bc8d0e Slightly simplify IsValidAudioPacket 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24524 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 11:44:51 +00:00
reimar
6bfcbe1e81 Simplify another two ifs into one 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24523 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 11:41:47 +00:00
reimar
7c8fcecc13 Make one mp_msg call out of 3 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24522 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 11:35:35 +00:00
reimar
6954f5c634 Simpler and more robust tar parsing 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24521 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 11:33:31 +00:00
reimar
0d74d82c74 Get rid of bloated ty_extension function 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24520 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 11:03:38 +00:00
reimar
749b59ce6c Do not uselessly name structs 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24519 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 10:59:27 +00:00
reimar
32c6bdf8c7 Remove another variable and reorder to avoid wasting space due to alignment 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24518 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 10:58:06 +00:00
reimar
41f50de3d0 PTS should be passed as int64_t to demux_ty_CopyToDemuxPacket 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24517 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 10:55:30 +00:00
reimar
c1bb529a3e Remove now useless parameters from demux_ty_CopyToDemuxPacket 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24516 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 10:54:37 +00:00
reimar
ee9b0c8066 Remove more unused code and variables 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24515 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 10:52:36 +00:00
diego
c7303ab055 cosmetics: Fix typo in function name. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24514 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-15 10:07:08 +00:00
reimar
eaf7b8614f live recordings can contain 0-size type 0 chunks, ignore them instead 
of erroring out.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24509 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 21:17:48 +00:00
reimar
92f501d8b2 Move some more variable declarations 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24508 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 21:03:08 +00:00
reimar
abac8f8fab Remove tabs and trailing whitespace 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24507 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 20:59:05 +00:00
reimar
d1ee624657 A few more useless () 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24506 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 20:49:36 +00:00
reimar
bf86cc9f87 Minor simplifications 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24505 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 20:48:04 +00:00
reimar
9bb5a91413 Further simplify demux_ty_FindESHeader 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24504 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 20:41:32 +00:00
reimar
99ef8adf6f Optimize demux_ty_FindESHeader 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24503 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 20:37:30 +00:00
reimar
9d885bbbe8 Remove some commented-out debugging code 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24502 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 20:18:00 +00:00
reimar
7ffd4426a3 Fix demux_ty_FindESHeader so it won't overread 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24501 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 20:09:39 +00:00
reimar
abfe1d69a1 Simplify demux_ty_FindESPacket by reusing demux_ty_FindESHeader 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24500 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 20:08:42 +00:00
reimar
f1f27ada1a Remove unused demux_ty_FindESPacket parameter 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24499 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 19:55:09 +00:00
reimar
8d8edc990a Simplify demux_ty_FindESHeader 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24498 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 19:53:09 +00:00
reimar
fb090bd8fa Move variable declarations into the block where they are used 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24497 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 19:46:54 +00:00
reimar
15940ebaff Another piece of duplicate code 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24496 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 19:34:17 +00:00
reimar
7d7cfea105 Avoid a big piece of duplicated code 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24495 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 19:30:25 +00:00
reimar
cb4d79be6b Get rid of more code duplication 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24494 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 19:13:47 +00:00
reimar
5072dde419 Simplify XDS handling 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24493 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-14 19:07:50 +00:00