summaryrefslogtreecommitdiffstats
path: root/libmpdemux
Commit message (Collapse)AuthorAgeFilesLines
* substream 0x75 doesn't seem to be a valid vc1 stream, after all; removednicodvb2007-01-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21997 b3059339-0415-0410-9bf9-f77b7e298cf2
* set priv->last_pts to the pts read only if the pts was really read; patch by ↵nicodvb2007-01-221-1/+6
| | | | | | zaek7q gmx net (Christian Aistleitner) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21996 b3059339-0415-0410-9bf9-f77b7e298cf2
* Discard -Wdeclaration-after-statement warning.diego2007-01-211-1/+1
| | | | | | | patch by Carl Eugen Hoyos, cehoyos ag.or at git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21992 b3059339-0415-0410-9bf9-f77b7e298cf2
* Instead of printing a useless "sig11 coming soon" message, just abort parsingreimar2007-01-211-1/+4
| | | | | | | | in the hope of still saving things (helps with at least http://sam.zoy.org/zzuf/lol-mplayer.wmv). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21986 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sanity-check sh_video->bih->biSizereimar2007-01-212-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21985 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify by using av_codec_get_id and include riff.h only in demux_lavf.creimar2007-01-212-14/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21984 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forgotten CodecTag -> AVCodecTagreimar2007-01-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21980 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation after lavf changesreimar2007-01-212-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21979 b3059339-0415-0410-9bf9-f77b7e298cf2
* support -ffourcc with -of lavfreimar2007-01-212-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21978 b3059339-0415-0410-9bf9-f77b7e298cf2
* in h264_parse_sps() reuse mp_unescape03()nicodvb2007-01-201-27/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21971 b3059339-0415-0410-9bf9-f77b7e298cf2
* vc1 probing code: if sh_video->bih can't be callocated exitnicodvb2007-01-201-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21970 b3059339-0415-0410-9bf9-f77b7e298cf2
* in vc1 probing code, all packets before the first sequence header must be ↵nicodvb2007-01-201-1/+1
| | | | | | skipped, not read git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21969 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unused variables; replaced wrong call to realloc() with calloc() in ↵nicodvb2007-01-201-3/+1
| | | | | | vc1 probing code git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21968 b3059339-0415-0410-9bf9-f77b7e298cf2
* decode vc1 sequence header and frame it in video_read_frame();nicodvb2007-01-201-0/+73
| | | | | | | | it doesn't work yet, but it permits debugging and development to Kostya git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21967 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux vc1 (stream id 0x1Fd with 0x55 <= substream id <= 0x5F in the ↵nicodvb2007-01-201-2/+37
| | | | | | pes_extension_2 payload) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21966 b3059339-0415-0410-9bf9-f77b7e298cf2
* added function to parse vc1 sequence headernicodvb2007-01-202-0/+116
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21965 b3059339-0415-0410-9bf9-f77b7e298cf2
* Compile fix: LE_* -> AV_RL*reimar2007-01-191-13/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21963 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000l; fixed wrong operator precedencenicodvb2007-01-171-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21952 b3059339-0415-0410-9bf9-f77b7e298cf2
* unified creation of sh_audio and sh_video is ts_add_stream; patch by elupusnicodvb2007-01-171-70/+75
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21947 b3059339-0415-0410-9bf9-f77b7e298cf2
* in evo files [e]ac3 substreams range from 0xc0 to 0xcfnicodvb2007-01-161-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21945 b3059339-0415-0410-9bf9-f77b7e298cf2
* Interlaced gif supportreimar2007-01-161-2/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21940 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change some types to uint8_t where appropriatereimar2007-01-161-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21939 b3059339-0415-0410-9bf9-f77b7e298cf2
* "Cosmetics" Introduce a memcpy function doing both transparentreimar2007-01-161-15/+21
| | | | | | | and non-transparent copy. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21938 b3059339-0415-0410-9bf9-f77b7e298cf2
* one more #if 1 removednicodvb2007-01-151-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21937 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed useless #if1s added too long time agonicodvb2007-01-151-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21936 b3059339-0415-0410-9bf9-f77b7e298cf2
* in EVO files substreams 0xC0 of private streams 0xBD contain [e]ac3.nicodvb2007-01-151-1/+2
| | | | | | | | A more proper range will be committed when specs begin to appear; for the time being enjoy the audio stream git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21935 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_rtp_codec.cpp:100: `INT_MAX' undeclared (first use this function)diego2007-01-151-0/+1
| | | | | | | patch by Carl Eugen Hoyos, cehoyos ag.or at git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21929 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmeticsreimar2007-01-131-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21914 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement gif transparencyreimar2007-01-131-0/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21913 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix: refmodes 2 and 3 leave useref unchangedreimar2007-01-131-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21912 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmeticsreimar2007-01-131-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21911 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement refmode == 2 in gif demuxerreimar2007-01-131-4/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21910 b3059339-0415-0410-9bf9-f77b7e298cf2
* Partially support gif using "reference" imagesreimar2007-01-131-1/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21909 b3059339-0415-0410-9bf9-f77b7e298cf2
* memset + malloc -> callocreimar2007-01-131-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21908 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cast SWidth/SHeight to uint16_t, since that's what they actually are.reimar2007-01-131-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21905 b3059339-0415-0410-9bf9-f77b7e298cf2
* Forgot to adjust length of memsetreimar2007-01-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21904 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify gif demuxer by using memcpy_picreimar2007-01-131-8/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21903 b3059339-0415-0410-9bf9-f77b7e298cf2
* One more bounds check, though IMO the gif lib really should do this.reimar2007-01-131-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21902 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplifyreimar2007-01-131-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21901 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash for gif images that have Top or Left setreimar2007-01-131-5/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21900 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix invalid read for gifs with a palette for less than 256 colorsreimar2007-01-131-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21899 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move global variables in gif demuxer into priv structreimar2007-01-131-21/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21898 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: typo fix pallete --> palettediego2007-01-131-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21894 b3059339-0415-0410-9bf9-f77b7e298cf2
* Frametime was being read from the wrong offset, comparediego2007-01-131-1/+1
| | | | | | | | http://www.onicos.com/staff/iz/formats/gif.html#gceb patch by John Koleszar, jkoleszar on2 com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21893 b3059339-0415-0410-9bf9-f77b7e298cf2
* add support for avc1 in X-QT over RTSPgpoirier2007-01-121-0/+21
| | | | | | | patch by Carl Eugen Hoyos cehoyos at ag.or.at git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21889 b3059339-0415-0410-9bf9-f77b7e298cf2
* dont write an index and dont use memory to build one if -noidx is specifiedmichael2007-01-081-2/+2
| | | | | | | ... maybe this should use its own option though instead of using -noidx ? git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21858 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify demux_ogg to use the sub_clear_text and sub_add_text functions.reimar2007-01-061-40/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21846 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle handling cleanup: factor out code for parsing embedded subtitlesreimar2007-01-062-168/+15
| | | | | | | and adding and removing of lines in subtitle struct into subreader.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21845 b3059339-0415-0410-9bf9-f77b7e298cf2
* Include "internal" libavformat/riff.h also when dynamic libavformat is usedreimar2007-01-062-16/+2
| | | | | | | | instead of duplicating typedefs and function prototypes in already three different places. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21840 b3059339-0415-0410-9bf9-f77b7e298cf2
* Include libavformat/riff.h when building with static libavformat andreimar2007-01-061-4/+11
| | | | | | | add and correct prototypes if not. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21838 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify after last demux_ogg commitreimar2007-01-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21830 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not access ogg_d->subs after freeing it.reimar2007-01-051-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21829 b3059339-0415-0410-9bf9-f77b7e298cf2
* sizeof() is long, thus %d format in error message is wrong.reimar2007-01-051-5/+6
| | | | | | | | Fix by assigning extradata_size before and printing that, since this also removes a bit of code duplication. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21828 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,reimar2007-01-052-8/+8
| | | | | | | -1 could be a perfectly valid pts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21827 b3059339-0415-0410-9bf9-f77b7e298cf2
* set dp->stream_pts only when feeding the video stream to workaroundnicodvb2007-01-011-1/+7
| | | | | | | | | strange interleaving patterns in some samples (that show with wild alternations of the OSD timer going back and forth) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21807 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed unused variablenicodvb2006-12-311-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21803 b3059339-0415-0410-9bf9-f77b7e298cf2
* use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)nicodvb2006-12-311-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21798 b3059339-0415-0410-9bf9-f77b7e298cf2
* replace call to ds_read_packet() with the usual ↵nicodvb2006-12-311-1/+19
| | | | | | | | | | stream_read()+ds_add_packet() sequence; fill demux_packet->stream_pts if the stream layer supports it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21797 b3059339-0415-0410-9bf9-f77b7e298cf2
* added stream_pts to demuxer_t and demux_packet_t to hold the time value ↵nicodvb2006-12-312-2/+7
| | | | | | reported by the stream layer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21796 b3059339-0415-0410-9bf9-f77b7e298cf2
* sortmichael2006-12-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21795 b3059339-0415-0410-9bf9-f77b7e298cf2
* dont read index if -noidxmichael2006-12-291-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21788 b3059339-0415-0410-9bf9-f77b7e298cf2
* first step toward amr-nb muxing supportmichael2006-12-292-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't compile demux_mpc.c when libmpcdec is disabledaurel2006-12-282-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21783 b3059339-0415-0410-9bf9-f77b7e298cf2
* add support for musepack native decoder from ffmpeg (require -demuxer lavf)aurel2006-12-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21779 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync to libnut, nom->numods152006-12-231-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21739 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix display of multiple simultaneous subtitles without libass.uau2006-12-211-1/+3
| | | | | | | Was broken in r19649. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21720 b3059339-0415-0410-9bf9-f77b7e298cf2
* muxers now write to output muxer->stream rather than to muxer->filenicodvb2006-12-187-77/+93
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21676 b3059339-0415-0410-9bf9-f77b7e298cf2
* doxify a commentreimar2006-12-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21667 b3059339-0415-0410-9bf9-f77b7e298cf2
* Require 12 consecutive MPEG-audio headers before detecting as audio.reimar2006-12-181-1/+1
| | | | | | | Fixes misdetection of http://samples.mplayerhq.hu/FLV/flv_misdetected_as_mpa git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21666 b3059339-0415-0410-9bf9-f77b7e298cf2
* ASF aspect support via metadata reading.reimar2006-12-151-0/+83
| | | | | | | | Patch by Zuxy Meng (zuxy meng (at) gmail.com) with some simplifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21626 b3059339-0415-0410-9bf9-f77b7e298cf2
* VobSub tracks cannot be handled by libass, do not mark them with 'a'.eugeni2006-12-151-1/+2
| | | | | | | This fixes the bug with VobSub not being displayed with -ass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21625 b3059339-0415-0410-9bf9-f77b7e298cf2
* Respect -noidx in lavf demuxerreimar2006-12-101-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21584 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set AVFMT_FLAG_GENPTS if -correct-pts is used.uau2006-12-101-0/+4
| | | | | | | | | | | | | This should allow using -correct-pts (and thus filters which adjust pts or add frames) with dvd or other mpeg container files by specifying "-correct-pts -demuxer lavf -vc ffmpeg12". Might work with libmpeg2 decoder too but certainly not with internal demuxer. Using this flag isn't quite optimal as it can cause extra buffering of demuxed frames, but at least it's better than just failing until a more complex solution is implemented. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21564 b3059339-0415-0410-9bf9-f77b7e298cf2
* align vbuf_size to the max value allowed by main profile @ high levelnicodvb2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21560 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace another MIN macro by FFMINreimar2006-12-091-10/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21548 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of min/max macros from aviheader.h, they do not belong here.reimar2006-12-096-29/+17
| | | | | | | Replace their uses by FFMIN/FFMAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21547 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove condition that should always be truereimar2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21545 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix crash in ogg demuxer uninit with -aidreimar2006-12-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21544 b3059339-0415-0410-9bf9-f77b7e298cf2