summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples.cehoyos2009-12-281-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30134 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r30100: It breaks some mov and asf samples.cehoyos2009-12-281-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30133 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for parsing audio streams (though should be easy to extend to video)reimar2009-12-276-1/+143
| | | | | | | | | | | via libavcodec. Parsing can be done at the demuxer stage (currently disabled) or at the decoder (ad_ffmpeg, enabled). Should allow using the libavcodec AAC, DTS, ... decoders independent of container format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove currently unneeded members accidentally added in the last revision.reimar2009-12-271-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30129 b3059339-0415-0410-9bf9-f77b7e298cf2
* Introduce a sh_common struct that contains the parts in common by the audio, ↵reimar2009-12-271-19/+25
| | | | | | | | | | | | video and sub "stream headers". One reason for this is to help avoid/make more obvious things like members with the same function but different name (extradata vs. codecdata etc.), or members with the same name but different semantics (pts for audio vs. pts for video). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30128 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove one more incorrect direct ass.h include.reimar2009-12-271-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30127 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix grammar/missing verb in description.reimar2009-12-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30112 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unnecessary entries from extension_table, these formats are alreadyreimar2009-12-251-4/+0
| | | | | | | in the lavf preferred_list, and thus will be handled by lavf immediately. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30111 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a (unfortunately rather long) explanation on how and when to use itreimar2009-12-251-0/+6
| | | | | | | to the file extension -> demuxer mapping list. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30110 b3059339-0415-0410-9bf9-f77b7e298cf2
* force cdg to lavf demuxer in extensions.c, misdetected as mpeg otherwisecompn2009-12-241-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30109 b3059339-0415-0410-9bf9-f77b7e298cf2
* create CDGR fourcc in mp_taglist and add ffcdgraphics to codecs.confcompn2009-12-241-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30104 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use correct-pts by default for demuxer lavf, it breaks all PAFF files.cehoyos2009-12-221-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30100 b3059339-0415-0410-9bf9-f77b7e298cf2
* Never include ass.h and ass_types.h directly, use ass_mp.h instead.reimar2009-12-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30067 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not modify priv->idx_pos when regenerating the index, use a localreimar2009-12-171-5/+5
| | | | | | | | | variable instead. should fix seeking after starting playback with -force-idx broken by r29914. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30052 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid miscompilation issues with the grow_array function more permanentlyreimar2009-12-111-1/+1
| | | | | | | by marking it noinline. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29992 b3059339-0415-0410-9bf9-f77b7e298cf2
* Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too manyreimar2009-11-224-6/+6
| | | | | | | name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
* av_alloc_format_context -> avformat_alloc_contextreimar2009-11-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29959 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reuse buffer in priv context instead of allocating the 32kB probe bufferreimar2009-11-221-4/+3
| | | | | | | on the stack. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29953 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move 128kB buffer from stack to demuxer context.reimar2009-11-201-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29940 b3059339-0415-0410-9bf9-f77b7e298cf2
* calloc instead of malloc+memset.reimar2009-11-201-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29939 b3059339-0415-0410-9bf9-f77b7e298cf2
* Silence two gcc warnings: suggest parentheses around && within ||cehoyos2009-11-181-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29934 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set display size in sh_video when decoding H264.cehoyos2009-11-161-0/+2
| | | | | | | This fixes H264 VDPAU decoding with some native demuxers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29920 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use calloc instead of initializing each struct member individually to 0.reimar2009-11-161-22/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29914 b3059339-0415-0410-9bf9-f77b7e298cf2
* Try to detect broken files with unaligned chunks.reimar2009-11-162-0/+16
| | | | | | | | | This patch hopefully makes them playable as long as they have and index without breaking any other files. Fixes http://samples.mplayerhq.hu/avi/invalid_unaligned.avi with native demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29913 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix declarations in mp_taglists.h and include it in mp_taglists.c toreimar2009-11-112-3/+4
| | | | | | | make such mismatches impossible in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29901 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow lavf demuxer to also probe and play files < 32 kB (full probe buffer ↵reimar2009-11-101-2/+4
| | | | | | | | | size). Based on patch by On2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29882 b3059339-0415-0410-9bf9-f77b7e298cf2
* Calculate length of ASF files with more than 1 second precision.reimar2009-11-102-2/+2
| | | | | | | Based on patch by On2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29881 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix length calculation for ASF, preroll is in ms, play time in 100 ns.reimar2009-11-101-1/+1
| | | | | | | Based on patch by On2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29880 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove useless castreimar2009-11-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29879 b3059339-0415-0410-9bf9-f77b7e298cf2
* Free demuxer->teletext when closing the demuxer.reimar2009-11-101-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29874 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow demuxer lavf to export CODEC_ID_DVB_TELETEXT.cehoyos2009-11-071-0/+2
| | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29849 b3059339-0415-0410-9bf9-f77b7e298cf2
* Separate teletext from tv support.cehoyos2009-11-071-0/+3
| | | | | | | Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove pointless and broken (e.g. does not set aid and vid) -tsprog handlingreimar2009-11-071-22/+3
| | | | | | | | from lavf demuxer, mplayer.c makes sure IDENTIFY_PROGRAM is called with the right arguments, and that code actually works in contrast to the one in demux_open_lavf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29847 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove an empty program if the one requested by IDENTIFY_PROGRAM does not existreimar2009-11-071-4/+4
| | | | | | | instead of incorrectly claiming that the demuxer does not support programs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29845 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: alphabetizecompn2009-11-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29820 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l for breaking compilation. change eatgv to tgvcompn2009-11-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29819 b3059339-0415-0410-9bf9-f77b7e298cf2
* add ffmpeg eatgv codeccompn2009-11-031-0/+1
| | | | | | | patch by Jan Engelhardt jengelh ta medozas.de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29816 b3059339-0415-0410-9bf9-f77b7e298cf2
* demuxer.c: Add initialization missing from previous commituau2009-11-021-21/+5
| | | | | | | | | | | | | Reimar's previous commit ("Unbreak the demuxer-specific code in video.c with e.g.") added the new field "non_interleaved" in demux_stream structs, but this field was not initialized anywhere. Under suitable circumstances this could cause a "Too many video/audio packets in the buffer" error and failing playback. Fix the problem by cleaning up the code that creates new instances of the struct. Now fields will be initialized to 0 by default. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29812 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unbreak the demuxer-specific code in video.c with e.g.reimar2009-11-012-0/+8
| | | | | | | | | | -audiofile by moving the code to manually interleave subtitles to mp_common.c. video.c should still be changed to not be demuxer-specific anymore, it is bad practice but fully fixing it is non-trivial. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29810 b3059339-0415-0410-9bf9-f77b7e298cf2
* Find and take into account stream start time for ogg files.reimar2009-10-161-19/+34
| | | | | | | | | | | This also makes the demuxing function set the keyframe flag for vorbis packets that aren't header packets and have a time stamp, even if we do not have vorbis_info struct yet. The reason for this is that header packets always have 0 as time stamp. Fixes bug #1585 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29776 b3059339-0415-0410-9bf9-f77b7e298cf2
* Play TrueHD in BluRay with demuxer lavf.cehoyos2009-10-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29751 b3059339-0415-0410-9bf9-f77b7e298cf2
* lavf: if seeking in the desired direction failed, also try in the opposite one,reimar2009-09-301-1/+4
| | | | | | | | otherwise we might end up at some random position (where lavf last ended up while trying to build the index). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29741 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid void * arithmetic.reimar2009-09-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29740 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify aac_get_sample_rate_indexreimar2009-09-301-24/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29739 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for grow_array allocation failure.reimar2009-09-301-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29738 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid a possible crash if num_cluster_pos is 0.reimar2009-09-301-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29737 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for integer overflow in grow_array.reimar2009-09-301-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29736 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rearrange code of grow_array to make it easier to extend.reimar2009-09-301-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29735 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid a memleak if realloc fails in grow_array.reimar2009-09-301-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29734 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change grow_array argument from void ** to void *, this avoids a aliasingreimar2009-09-301-4/+5
| | | | | | | | violation (thus making gcc 4.4.x compile the code correctly) and allows to get rid of some casts at the expense of making the code less clear. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29733 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add 0x85 ad ID for DTS audio.diego2009-09-231-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29703 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow playback of dnxhd files, as produced by FFmpeg regression test.cehoyos2009-09-221-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29700 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of useless indirection and use the demuxer argument directly instead ofreimar2009-09-141-2/+1
| | | | | | | | | ds->demuxer. This makes it also work again with -audiofile without having to add more hacks to demux_demuxers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29677 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reduce verbosity if demuxer sets an info value to the same as the current value.reimar2009-09-141-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29676 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add w64 to list of preferred lavf formats (otherwise demux_audio incorrectlyreimar2009-09-101-0/+1
| | | | | | | | claims the Wave64 files but can not handle them). Patch by Daniel Verkamp [daniel drv nu]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29668 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sort preferred_list alphabetically since the order does not matter otherwise.reimar2009-09-101-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29667 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add CODEC_ID_ADPCM_IMA_AMV to lavf codec_tag override list instead ofreimar2009-09-082-2/+1
| | | | | | | reimplementing that functionality. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29664 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make all mp_*_taglists const.reimar2009-09-081-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29663 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix an endless loop if all programs are empty.reimar2009-09-081-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29660 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always register all streams from libavformat, not just those belonging to a ↵reimar2009-09-081-5/+3
| | | | | | program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29657 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for lavf vqf demuxer and lavc TwinVQ decoder.vitor2009-09-073-1/+3
| | | | | | | | | Also make lavf the default demuxer for vqf. Ok'ed by Compn on IRC. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29655 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, SIZE_MAX must be UINT_MAX to prevent an integer overflow later on,reimar2009-09-041-1/+1
| | | | | | | also it is preferable if demuxer parsing does not differ between architectures. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29640 b3059339-0415-0410-9bf9-f77b7e298cf2
* free(), delete and delete[] are all different and can't just be used at random,reimar2009-09-021-2/+2
| | | | | | | so change code to use the one appropriate for the allocation used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29627 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a hack to ensure data from e.g. mov format -subfile gets read at allreimar2009-09-011-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29611 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack demux_demuxers so that demux_demuxers_fill_buffer is actually called.reimar2009-09-011-3/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29610 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix MPEG-4 ASP in MPEG transport streams with -demuxer lavf.cehoyos2009-08-311-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29600 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix EAC3 in MPEG transport streams with -demuxer lavf.cehoyos2009-08-311-0/+1
| | | | | | | Patch by Wang William, william0wang gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29599 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix DTS in MPEG transport streams with -demuxer lavf.cehoyos2009-08-311-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29597 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix AAC in MPEG transport stream for -demuxer lavf.cehoyos2009-08-311-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29596 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: alphabetically order listsdiego2009-08-311-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29595 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename mp_wav_override_tag* as mp_codecid_override_tag* to reflect thatcehoyos2009-08-303-4/+6
| | | | | | | it now can be used for both audio and video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29593 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix MPEG2 and H264 in MPEG transport stream with demuxer lavf.cehoyos2009-08-301-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29591 b3059339-0415-0410-9bf9-f77b7e29