summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* Split muxers into a separate library that only MEncoder is linked against.diego2006-11-271-9/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move common code to mpcommon.mak.diego2006-11-271-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21323 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary header indirection.diego2006-11-271-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21305 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: Muxers were not being compiled even when MEncoder was enabled.diego2006-11-271-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21302 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg-style conditional dependency declarationdiego2006-11-261-43/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21291 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge common parts of all Makefiles into one file included by all.diego2006-11-261-28/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify, remove useless indirection.diego2006-11-261-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21263 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cleanup for uselessly complicated closed-caption subtitle handlingreimar2006-11-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21252 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous comment.diego2006-11-251-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: indentation fix.eugeni2006-11-231-10/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21182 b3059339-0415-0410-9bf9-f77b7e298cf2
* permit muxing to raw pes (VDR uses this)nicodvb2006-11-211-5/+26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21157 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove superfluous empty variable declaration.diego2006-11-211-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21120 b3059339-0415-0410-9bf9-f77b7e298cf2
* check we aren't short of sh_videos before allocating another onenicodvb2006-11-201-13/+35
| | | | | | | | and fail if the allocation doesn't succeed; added support for video stream switching git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21116 b3059339-0415-0410-9bf9-f77b7e298cf2
* slight simplification in demux_control_ts: no need to check *arg with ↵nicodvb2006-11-201-1/+1
| | | | | | last_{aid,vid} (small bugfix, too) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21115 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify dep/depend targets.diego2006-11-201-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reorganize code to move more things out of main().uau2006-11-201-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21093 b3059339-0415-0410-9bf9-f77b7e298cf2
* in demux_ts_control unified SWITCH_AUDIO and SWITCH_VIDEO (they were identical)nicodvb2006-11-191-79/+33
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21088 b3059339-0415-0410-9bf9-f77b7e298cf2
* during DEMUXER_CTRL_SWITCH_x *arg set to -2 identifies 'disable stream x'nicodvb2006-11-191-6/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21083 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, compilation error in r21054reimar2006-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21055 b3059339-0415-0410-9bf9-f77b7e298cf2
* Generalize subtitle switching, demux_ogg does not need a special casereimar2006-11-193-33/+2
| | | | | | | anymore and demux_mov works now, too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -slang work again, sub->id is -2 by default, so -slang would be ignoredreimar2006-11-191-1/+1
| | | | | | | with old code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21052 b3059339-0415-0410-9bf9-f77b7e298cf2
* Create a sh_sub_t for ogg subtitles.reimar2006-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21051 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support multiple subs in movreimar2006-11-191-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21048 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix demux_nut to give proper (estimate) of percent position after a seekods152006-11-181-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21039 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add disabled EAGAIN testing code for libnutods152006-11-181-6/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21038 b3059339-0415-0410-9bf9-f77b7e298cf2
* move demux_nut priv calloc to init() instead of check_file()ods152006-11-181-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21027 b3059339-0415-0410-9bf9-f77b7e298cf2
* implemented DEMUXER_CTRL_IDENTIFY_PROGRAMnicodvb2006-11-181-0/+85
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21022 b3059339-0415-0410-9bf9-f77b7e298cf2
* new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)nicodvb2006-11-181-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21021 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for XAN DPCM audiodiego2006-11-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21006 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for some more fringe formats, still buggy ..diego2006-11-171-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20996 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try reading palette for vobsubreimar2006-11-171-1/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20995 b3059339-0415-0410-9bf9-f77b7e298cf2
* Pseudo-support for subtitles in ↵reimar2006-11-171-0/+1
| | | | | | http://samples.mplayerhq.hu/sub/jpn_engSUB_sample.3gp git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20992 b3059339-0415-0410-9bf9-f77b7e298cf2
* missed piece in update to libnut API - non negative errorsods152006-11-171-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20987 b3059339-0415-0410-9bf9-f77b7e298cf2
* support flic video through lavfdiego2006-11-171-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20979 b3059339-0415-0410-9bf9-f77b7e298cf2
* COSMETICS: reformattednicodvb2006-11-161-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20971 b3059339-0415-0410-9bf9-f77b7e298cf2
* restored circular looping when changing audio and video stream (previously ↵nicodvb2006-11-161-2/+6
| | | | | | broken) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20970 b3059339-0415-0410-9bf9-f77b7e298cf2
* reset demuxer's buffered demux_packet after DEMUXER_CTRL_SWITCH_AUDIOnicodvb2006-11-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20968 b3059339-0415-0410-9bf9-f77b7e298cf2
* implemented DEMUXER_CTRL_SWITCH_VIDEOnicodvb2006-11-161-1/+75
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20967 b3059339-0415-0410-9bf9-f77b7e298cf2
* added code to switch video streamnicodvb2006-11-162-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Restore alphabetical order, align both tables.diego2006-11-161-11/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20960 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for RoQ video and audio through libavformatdiego2006-11-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20958 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for Electronic Arts ADPCM audiodiego2006-11-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20957 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for Delphine CIN audio and videodiego2006-11-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20956 b3059339-0415-0410-9bf9-f77b7e298cf2
* update to libnut API, non-negative errorsods152006-11-161-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20954 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for Interplay DPCM audiodiego2006-11-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20952 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: alphabetical order and prettyprinting for the CodecTag tablediego2006-11-161-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20951 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for Sierra VMD videodiego2006-11-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20950 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for Tiertex SEQ video.diego2006-11-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20949 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for Westwood IMA ADPCM audio.diego2006-11-151-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20947 b3059339-0415-0410-9bf9-f77b7e298cf2
* update to libnut, no nut_skip_packet()ods152006-11-151-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20942 b3059339-0415-0410-9bf9-f77b7e298cf2
* update to libnut API, don't free the streamsods152006-11-151-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20941 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't spam the console with timestamps (non-error messages printed every rtogni2006-11-141-2/+2
| | | | | | | frame should be lower than V level) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20937 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix extradata passing to lavc RV20 decoderrtogni2006-11-142-61/+17
| | | | | | | | | | | | 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
* update to libnut, add cache_syncpointsods152006-11-141-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20925 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l copy&Ãpaste bug in subtitle sh handlingreimar2006-11-141-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20923 b3059339-0415-0410-9bf9-f77b7e298cf2
* update to libnut, rename nut.h->libnut.hods152006-11-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20909 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try to handle oversized asf headers by ignoring anything beyond the first MBreimar2006-11-131-2/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20894 b3059339-0415-0410-9bf9-f77b7e298cf2
* Incomplete support for vobsub (missing palette support) andreimar2006-11-131-0/+57
| | | | | | | | 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
* Move sh_sub_t to stheader.h, where all the other sh structs are definedreimar2006-11-132-14/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20892 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add forgotten new_sh_subreimar2006-11-131-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20889 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make subtitle stream handling more similar to audio and video streams.reimar2006-11-134-8/+29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
* change include "nut.h" to <nut.h> to make gcc pick the correct nut.h for ↵ods152006-11-121-1/+1
| | | | | | libnut de/muxer.. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20868 b3059339-0415-0410-9bf9-f77b7e298cf2
* consistency fix: STREAM_CTRL_GET_TIME_LENGTH and ↵nicodvb2006-11-122-11/+7
| | | | | | 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
* Remove duplicate message, the same info is printed anyway.diego2006-11-121-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20863 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed duplicated check in demuxer_seek_chapternicodvb2006-11-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20857 b3059339-0415-0410-9bf9-f77b7e298cf2
* in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call ↵nicodvb2006-11-111-0/+2
| | | | | | 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
* shut warning on "realloc undefined" in demuxer.hods152006-11-101-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20831 b3059339-0415-0410-9bf9-f77b7e298cf2
* update libnut APIods152006-11-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20830 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change some constants in pts arithmetic from float to double.uau2006-11-091-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20811 b3059339-0415-0410-9bf9-f77b7e298cf2
* Changed code that used pts=0 in demux packets to indicate "not known".uau2006-11-091-13/+13
| | | | | | | Now demux_real should be usable with -correct-pts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20810 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash when attempting to seek in a streamed unseekable stream, likegpoirier2006-11-081-0/+2
| | | | | | | | mms://a632.v3306a.c3306.e.vm.akamaistream.net/7/632/3306/v1/multith.download.akamai.com/3306/2005/COMEDIE/1144-0186-001.wmv patch by alexandre % alex14fr A yahoo P fr % git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20808 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move some FourCC values from libavformat/riff.c to our private mapping.diego2006-11-081-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20776 b3059339-0415-0410-9bf9-f77b7e298cf2
* added demuxer_get_current_time() to get the current playtime (possibly aided ↵nicodvb2006-11-072-0/+18
| | | | | | by the stream layer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20765 b3059339-0415-0410-9bf9-f77b7e298cf2
* now demux_seek() tries to seek aided by the stream layer, if possiblenicodvb2006-11-071-0/+23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20764 b3059339-0415-0410-9bf9-f77b7e298cf2
* added definition of DEMUXER_CTRL_RESYNCnicodvb2006-11-071-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20763 b3059339-0415-0410-9bf9-f77b7e298cf2
* fprintf -> mp_msgmichael2006-11-071-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20756 b3059339-0415-0410-9bf9-f77b7e298cf2
* If parsing a seek head fails then mplayer should try continue parsing the ↵mosu2006-11-071-0/+9
| | | | | | file after the seek head. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20750 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add our own CODEC_ID -> fourcc translation tables so we do not needreimar2006-11-071-0/+22
| | | | | | | | | | to put them into ffmpeg. Also adds support for S24BE and S8 audio formats, which fixes e.g. http://samples.mplayerhq.hu/A-codecs/MACE/Bach1-1.aiff and http://samples.mplayerhq.hu/MXF/ebu_small.mxf . git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20749 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix index-based seeking in audio-only files, fixes bug #621reimar2006-11-051-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20728 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix an obvious typo.eugeni2006-11-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20716 b3059339-0415-0410-9bf9-f77b7e298cf2
* better wording for "workarounding"kraymer2006-11-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20712 b3059339-0415-0410