summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30375Uoti Urpala2010-01-251-0/+1
|\
| * Add a proper header for our strsep implementation so strsep willreimar2010-01-171-0/+1
| | | | | | | | | | | | | | not be used without a declaration, causing issues on 64 bit systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30355 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30322Uoti Urpala2010-01-251-0/+1
|\|
| * -demuxer rawaudio data will often need parsing (e.g. when it is used for rawreimar2010-01-151-0/+1
| | | | | | | | | | | | | | AC3 instead of libavformat), so set needs_parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30312 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30301Uoti Urpala2010-01-251-9/+9
|\|
| * Use double-precision constants instead of single precision that gets cast to ↵reimar2010-01-131-3/+3
| | | | | | | | | | | | double. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30299 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use double instead of float for pts.cehoyos2010-01-121-7/+7
| | | | | | | | | | | | | | Patch by Dan Oscarsson, Dan D Oscarsson A tieto D com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30298 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30250Uoti Urpala2010-01-251-0/+1
|\|
| * Fix MP1 with demuxer lavf in MPEG (PS) files.cehoyos2010-01-091-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30250 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn r30174Uoti Urpala2010-01-081-0/+2
|\|
| * Add support for JPEG2000 via FFmpeg/OpenJPEGreimar2010-01-031-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2
* | demux_mkv: improve seeking with generated indexUoti Urpala2010-01-011-46/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using generated index (-idx / -forceidx) the Matroska seeking code first guessed a file position using bitrate-based heuristics, then located the cluster nearest to that file position. Change it to store cluster timestamps in addition to file positions and seek to the cluster with the closest timestamp. This makes seeking with -idx a lot more accurate. This change also fixes a crash when trying to seek with generated index before playing any data from the beginning of the file (could be triggered by -idx together with ordered chapters or -ss for example). I removed the code handling MATROSKA_ID_CUES in the middle of parsing clusters. Such cue entries were not consistently handled if encountered during playback instead of index creation and the seek code was also buggy when they were encountered and parsed; i didn't consider it worth the effort to fix it.
* | demux_mkv: remove useless codeUoti Urpala2009-12-311-16/+2
| | | | | | | | | | Remove leftover code that no longer did anything useful after earlier changes.
* | demux_mkv: respect -forceidxUoti Urpala2009-12-311-1/+1
| | | | | | | | | | Don't use the index included in the file if the -forceidx option was specified.
* | Merge svn changes up to r30136Uoti Urpala2009-12-307-27/+172
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * 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
* | Merge svn changes up to r30104Uoti Urpala2009-12-301-0/+1
|\| | | | | | | Ignore the broken correct-pts change in r30100.
| * 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
* | demux_mkv.c, ebml.c: Reformat to K&R styleUoti Urpala2009-12-292-2441/+2228
| |
* | Merge svn changes up to r30055Uoti Urpala2009-12-181-5/+5
|\|
| * 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
* | Fix printf format strings with invalid '%lf' conversionUoti Urpala2009-12-152-17/+17
| | | | | | | | | | | | | | Some code used an invalid '%lf' conversion specification for double arguments. Maybe they were written that way due to confusion with scanf where doubles are indicated by '%lf'; however it is not a valid printf format specifier. Change those cases to use '%f'.
* | Support for multiple editions in MatroskaDaniel Dawson2009-12-042-27/+66
| | | | | | | | | | | | | | | | Add code to intelligently choose an appropriate Matroska edition when there are several. Will choose, in descending order of preference: the edition chosen by the user through the option "-edition <edition id>" if it exists, the first edition with EditionFlagDefault set to 1 if there is one, or the first edition.
* | demux_mkv: Detect and warn about virtual timeline nestingDaniel Dawson2009-12-042-0/+18
| | | | | | | | | | | | | | | | | | Detect use of ChapterSegmentEditionUID element in a Matroska chapter definition, indicating inclusion of an external virtual timeline, which is not yet supported. Leave the chapter is the chapter list but set segment_uid to zero. This way timeline parsing will skip the chapter and avoid nonsensical output but will still print information about missing content.
* | options: Move ass_enabled to options structUoti Urpala2009-12-021-1/+1
| |
* | demux_mkv.c: Make time arithmetic more precise in one more caseUoti Urpala2009-12-021-1/+1
| | | | | | | | | | Use rounding instead of truncation in another case of double division used with integer variables.
* | Merge svn changes up to r29962Uoti Urpala2009-11-239-37/+33
|\|
| * 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
* | core: Add support for decoder reordering of pts valuesUoti Urpala2009-11-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a mode where libavcodec's reordered_opaque feature is used to associate container packet timestamps with decoded frames. This should improve behavior at least for MPEG files with interlaced h264; the previous code does not cope well with the libavformat demuxer producing two field packets with separate timestamps but the libavcodec h264 decoder only producing a single output frame for those two packets (so half the timestamps have no associated output frame). The current libavformat mpeg demuxer seems to finally work with interlaced h264 files and produce valid timestamps which are useful with a mode like this. By default MPlayer now selects between this new mode and the old one automatically based on the number of timestamp problems they cause; by default the new mode is used if both seem to work. The new option -pts-association-mode can be used to force a particular mode. If correct-pts mode is disabled this has no effect on timing. Also remove the "EXPERIMENTAL" marker from the manpage description of -correct-pts.
* | Merge svn changes up to r29912Uoti Urpala2009-11-169-71/+70
|\|
| * 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