Commit Graph

2312 Commits

Author SHA1 Message Date
reimar e22ab31677 10l, compilation error in r21054
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21055 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:35:39 +00:00
reimar b38e1ca6e7 Generalize subtitle switching, demux_ogg does not need a special case
anymore and demux_mov works now, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:23:54 +00:00
reimar 8f14f6d551 Make -slang work again, sub->id is -2 by default, so -slang would be ignored
with old code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21052 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 13:38:37 +00:00
reimar ceecfca462 Create a sh_sub_t for ogg subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21051 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 13:12:46 +00:00
reimar 5b391eb2a3 Support multiple subs in mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21048 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 11:55:03 +00:00
ods15 7a06410d18 fix demux_nut to give proper (estimate) of percent position after a seek
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21039 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 20:44:22 +00:00
ods15 75c1fd9c1d Add disabled EAGAIN testing code for libnut
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21038 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 20:13:18 +00:00
ods15 24be79ae8b move demux_nut priv calloc to init() instead of check_file()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21027 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 15:17:50 +00:00
nicodvb bdc75c29ae implemented DEMUXER_CTRL_IDENTIFY_PROGRAM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21022 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:32:14 +00:00
nicodvb c97dc5061d new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21021 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:31:31 +00:00
diego 67efdbe07a support for XAN DPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21006 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 11:24:09 +00:00
diego 2f67bb7b34 support for some more fringe formats, still buggy ..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20996 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 22:52:57 +00:00
reimar 2bf9053a66 Try reading palette for vobsub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20995 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 20:13:21 +00:00
reimar 99280ec76e Pseudo-support for subtitles in http://samples.mplayerhq.hu/sub/jpn_engSUB_sample.3gp
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20992 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 19:16:07 +00:00
ods15 4295799cf5 missed piece in update to libnut API - non negative errors
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20987 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 17:43:40 +00:00
diego 1fb5f0f90a support flic video through lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 10:35:10 +00:00
nicodvb c3530411cb COSMETICS: reformatted
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20971 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 22:09:24 +00:00
nicodvb 81173eeb6c restored circular looping when changing audio and video stream (previously broken)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20970 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 22:08:14 +00:00
nicodvb ced53d9d19 reset demuxer's buffered demux_packet after DEMUXER_CTRL_SWITCH_AUDIO
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20968 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:31:44 +00:00
nicodvb 6a0ab89e43 implemented DEMUXER_CTRL_SWITCH_VIDEO
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20967 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:30:35 +00:00
nicodvb 96e829fc9c added code to switch video stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:23:06 +00:00
diego 84c9fdbab0 cosmetics: Restore alphabetical order, align both tables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20960 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 13:15:05 +00:00
diego 0245dc0efc support for RoQ video and audio through libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20958 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:42:32 +00:00
diego 77b21dc757 support for Electronic Arts ADPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20957 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:33:12 +00:00
diego 25d71db765 support for Delphine CIN audio and video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20956 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:28:39 +00:00
ods15 f85f460eb9 update to libnut API, non-negative errors
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20954 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 07:07:22 +00:00
diego 199d26ea92 support for Interplay DPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20952 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 01:17:19 +00:00
diego ac47a614cd cosmetics: alphabetical order and prettyprinting for the CodecTag table
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20951 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:59:01 +00:00
diego d495a2823f support for Sierra VMD video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20950 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:56:35 +00:00
diego adf53a4caa Add support for Tiertex SEQ video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20949 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:20:55 +00:00
diego 61da56fefa Add support for Westwood IMA ADPCM audio.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20947 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 23:42:47 +00:00
ods15 41e99a2c76 update to libnut, no nut_skip_packet()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 11:36:22 +00:00
ods15 e7c9a5bbe4 update to libnut API, don't free the streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20941 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 11:26:05 +00:00
rtogni d4f55932c1 Don't spam the console with timestamps (non-error messages printed every
frame should be lower than V level)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20937 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:48:53 +00:00
rtogni 88990e297c Fix extradata passing to lavc RV20 decoder
Pass video codec extradata unchanged from demux_real, sync vd_realvid to 
the new format
Sync mkv demuxer to the changes above (cmsg24 extradata was totally 
broken before)
Detect cmsg24 size from extradata (was fixed)
Based on a patch by elupus >> elupus >a< ecce se <<


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20936 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:40:35 +00:00
ods15 214c8be4e1 update to libnut, add cache_syncpoints
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20925 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 17:00:47 +00:00
reimar 96ba82424f 10l copy&Ãpaste bug in subtitle sh handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20923 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 15:02:15 +00:00
ods15 f916c5d0c4 update to libnut, rename nut.h->libnut.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20909 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:01:54 +00:00
reimar 59e83201dd Try to handle oversized asf headers by ignoring anything beyond the first MB
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20894 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 19:16:39 +00:00
reimar fec63334f8 Incomplete support for vobsub (missing palette support) and
text (missing styles and edl support) subtitles in mov,
see also bug #611


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20893 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 18:41:24 +00:00
reimar 48c301ddbc Move sh_sub_t to stheader.h, where all the other sh structs are defined
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20892 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 18:38:29 +00:00
reimar 89b0172dce Add forgotten new_sh_sub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20889 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:18:05 +00:00
reimar c5fa0bbf92 Make subtitle stream handling more similar to audio and video streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:15:23 +00:00
ods15 565a0e8e45 change include "nut.h" to <nut.h> to make gcc pick the correct nut.h for libnut de/muxer..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20868 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 17:47:40 +00:00
nicodvb 6e28f63e36 consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 17:19:56 +00:00
diego 8619594a1d Remove duplicate message, the same info is printed anyway.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20863 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 16:03:39 +00:00
nicodvb c42fa438f4 removed duplicated check in demuxer_seek_chapter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20857 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-11 13:57:09 +00:00
nicodvb 5c361eff9d in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call DEMUXER_CTRL_RESYNC to notify the demuxer of the change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20855 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-11 11:53:32 +00:00
ods15 acd40ca816 shut warning on "realloc undefined" in demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20831 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 07:46:07 +00:00
ods15 c29caa76bd update libnut API
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20830 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 07:32:01 +00:00