summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mov.c
Commit message (Collapse)AuthorAgeFilesLines
* 10l: r23399 broke mov/mp4 demuxingcehoyos2007-05-281-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23402 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unused variables, patch by timwoj ieee org.diego2007-05-281-8/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
* Declarations and code should not be mixed.diego2007-04-251-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23107 b3059339-0415-0410-9bf9-f77b7e298cf2
* with -identify show audio and video id; patch by Andrew Savchenko (Bircoph ↵nicodvb2007-04-201-0/+3
| | | | | | list ru) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23028 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.diego2007-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix audio samplerates below 7000 Hz.uau2007-03-071-1/+1
| | | | | | | Patch from John Koleszar, jkoleszar on2 com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22482 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, avoid crash on invalid subtitle idreimar2007-02-241-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22333 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: typo fixes, usefuLL --> useful and aswell --> as welldiego2007-02-221-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22307 b3059339-0415-0410-9bf9-f77b7e298cf2
* English grammar fix: There is no 's' after "does not exist"reimar2007-02-141-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22219 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l copy-and-paste bug. Do not print video info when the problem is with ↵reimar2007-02-141-1/+1
| | | | | | subtitles git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22218 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set sub_utf8 for mov subs.reimar2007-02-051-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22152 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle handling cleanup: factor out code for parsing embedded subtitlesreimar2007-01-061-16/+2
| | | | | | | 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
* Remove superfluous bswap.h include.diego2006-12-021-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix 2 header bugs introduced by nplourde's previous commit:uau2006-11-281-1/+3
| | | | | | | | | #include "loader/qtx/qtxsdk/components.h" needs inttypes.h which was no more implicitly included by earlier headers, and "#ifdef MACOSX" was used before '#include "config.h"'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21370 b3059339-0415-0410-9bf9-f77b7e298cf2
* reordering of #include to avoid clash with math.h and quicktime/*.h, patch ↵nplourde2006-11-281-8/+8
| | | | | | by Crhis Roccati<roccati@pobox.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21369 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
* 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
* 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
* 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
* Add support for 13k Voice (Qclp) in 3g2 filesrtogni2006-08-111-1/+9
| | | | | | | | Fix vorbis detection so that it doesn't misdetect other codecs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19369 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for version 1 (64 bit) mvhd and mdhd, taken from libavformat mov demuxerreimar2006-08-061-4/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19349 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.diego2006-08-041-1/+14
| | | | | | | inspired by a patch from Emanuele Giaquinta, emanuele.giaquinta %@% gmail.com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19332 b3059339-0415-0410-9bf9-f77b7e298cf2
* auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar ↵nicodvb2006-08-041-0/+18
| | | | | | on2 com (fixed by me) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19331 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add simple edit list support to mov demuxer, it supports delay of audio and ↵atmos42006-07-231-0/+18
| | | | | | video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19175 b3059339-0415-0410-9bf9-f77b7e298cf2
* drops casts from void * on malloc/calloc from libmpdemux codereynaldo2006-07-131-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19067 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variables, patch by Stefan Huehner stefan at huehner org.diego2006-07-081-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up audio pts handling, make audio pts tracking in the audio-onlyuau2006-06-141-2/+0
| | | | | | | case work the same as with video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18713 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for vorbis in mp4/movnicodvb2006-06-091-2/+60
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18668 b3059339-0415-0410-9bf9-f77b7e298cf2
* Disable unsecure dumping of generic track with -v -v -vrtogni2006-06-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18584 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential integer overflows in memory allocation.rtogni2006-06-041-11/+2
| | | | | | | Patch by Rich and me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
* missing argument for mp_msg, fixes:rathann2006-05-131-1/+1
| | | | | | | demux_mov.c:1159: warning: too few arguments for format git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18492 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential integer overflows in memory allocation. Patch by Reimar and ↵rtognimp2006-05-111-13/+32
| | | | | | me, SIZE_MAX by Rich git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18445 b3059339-0415-0410-9bf9-f77b7e298cf2
* Partially revert 1.140, restoring the old behaviour for all codecsrtognimp2006-04-231-2/+5
| | | | | | | except for twos and sowt. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18219 b3059339-0415-0410-9bf9-f77b7e298cf2
* Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of ↵reynaldo2006-04-221-1/+1
| | | | | | modifications as usual git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18177 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix passing qdm2 extradata to lavc decoderrtognimp2006-03-271-1/+5
| | | | | | | | It was broken in rev 1.142, that code does not behave the same as the old one in some cases git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17983 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert all if(verbose>X) to mp_msg_test calls.diego2006-03-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
* le2me_32 is not necessary, tested by Diego on BE machinerathann2006-03-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17861 b3059339-0415-0410-9bf9-f77b7e298cf2
* in24/in32/fl32 little/big-endian QuickTime PCM audio supportrathann2006-03-131-3/+19
| | | | | | | approved by rxt git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17859 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reduce output verbosity in non-verbose mode, change some printf to mp_msg.diego2006-03-061-37/+37
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17757 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch fixes pcm (twos, swot) in MOV.rtognimp2006-03-021-2/+2
| | | | | | | | | | This fix playing samples produced by ffmpeg(which set correct values), and many samples in archive. Patch by Baptiste COUDURIER | baptiste . coudurier )( smartjog . com | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17717 b3059339-0415-0410-9bf9-f77b7e298cf2
* Second-try commit of this patch.corey2006-02-171-1/+1
| | | | | | | | | | | | 1. Include audio_delay as an argument to demux_seek. 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. I've quadruple checked this time; hopefully I haven't missed anything. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reverse commit of unfinished patch for passing audio_delay to the demuxers.corey2006-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. Include audio_delay as an argument to demux_seek.corey2006-02-071-1/+1
| | | | | | | | | | | 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. Other demuxers could be modified similarly in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
* massive attack: mp_msg printf format fixesrathann2006-01-121-27/+27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
* Partial support for QuickTime sound atom version 2.corey2006-01-021-5/+33
| | | | | | | | | | | | | | | This doesn't add support for parsing the sound atom itself, but does recognize the different offset at which the ESDS atom starts. Also, this patch supports "3" in the channels field, which indicates 6-channel (5.1) audio. For more information, see this mail: From: Corey Hickey <bugfood-ml@fatooh.org> To: mplayer-dev-eng@mplayerhq.hu Date: Wed, 28 Dec 2005 23:42:46 -0800 Subject: [PATCH] (partially) support QuickTime sound atom version 2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17284 b3059339-0415-0410-9bf9-f77b7e298cf2
* Unify include path handling, -I.. is in CFLAGS.diego2005-11-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, off by one error in last patch (codecdata length sanity check),reimar2005-10-051-1/+1
| | | | | | | caused crashes with qdmc audio. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16680 b3059339-0415-0410-9bf9-f77b7e298cf2
* Detect eof when seeking and do _not_ restart the video.reimar2005-09-281-1/+8
| | | | | | | Also fixes some invalid reads. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16614 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sanity-check codecdata_len, fixes crash in libfaad due to failed malloc forreimar2005-09-271-0/+3
| | | | | | | http://images.apple.com/movies/us/hd_gallery/gl1800/480p/the_brothers_grimm_m480pa.mov git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16612 b3059339-0415-0410-9bf9-f77b7e298cf2
* Wrong editlist handling: end pts must be included.reimar2005-09-161-1/+1
| | | | | | | | Fixes another BBC sample (why is it always BBC samples that break MPlayer??): http://images.apple.com/movies/us/hd_gallery/gl1800/720p/bbc-africa_m720p.mov git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16497 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -identify's 'ID_LENGTH=' print a float and not an integer.. Theods152005-09-021-1/+1
| | | | | | | | accuracey may be totally fake for some demuxers (mpg), but accurate for others.. (avi) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix move playlists (control must be returned to mplayer.c, with the demuxerreimar2005-08-311-1/+1
| | | | | | | returning the real URL as a packet). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16327 b3059339-0415-0410-9bf9-f77b7e298cf2
* extra size checks for samples array to avoid crashes in some rare cases.reimar2005-08-301-0/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16321 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer modularizationrtognimp2005-08-051-10/+26
| | | | | | | Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing range/length check for video trak desc (fixes bug #335).reimar2005-07-101-1/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15950 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetic: split the lschunks function in two.reimar2005-07-101-300/+317
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15949 b3059339-0415-0410-9bf9-f77b7e298cf2
* avoid bad memory accessreimar2005-06-201-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15784 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix memleak when playing mov filesreimar2005-06-201-0/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15781 b3059339-0415-0410-9bf9-f77b7e298cf2
* The Quicktime headers have changed slightly from 10.3.x to 10.4. Steven ↵nplourde2005-05-181-0/+2
| | | | | | Schultz <sms@2BSD.COM> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15509 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix audio playback for no-sound-3gp.3gp (amr nb)rtognimp2005-05-061-1/+1
| | | | | | | Patch by Richard van der Hoff * richardv * mxtelecom * com * git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15358 b3059339-0415-0410-9bf9-f77b7e298cf2
* Decode "d263" and "damr" atoms in 3gp filesrtognimp2005-05-051-0/+16
| | | | | | | Patch by adland git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15357 b3059339-0415-0410-9bf9-f77b7e298cf2
* Also '3g2a' can be used for 3GPP Profile 2rtognimp2005-04-281-0/+1
| | | | | | | Based on patch by adland git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15287 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix alac from QTpro (in standard mov file, not in m4a file)rtognimp2005-03-301-0/+11
| | | | | | | | Extradata is in a different place fixes samples/A-codecs/lossless/ALAC/alac.mov git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15023 b3059339-0415-0410-9bf9-f77b7e298cf2
* alac support via lavc decoderrtognimp2005-03-061-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14923 b3059339-0415-0410-9bf9-f77b7e298cf2
* set sh_audio->delay ins audio-only case so that correct time is displayedreimar2005-03-011-0/+2
| | | | | | | after seeking. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14878 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mp3On4 demuxer supportrtognimp2005-02-151-0/+2
| | | | | | | Patch by Larry Ruedisueli lwr at audioresearchlabs dot com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14707 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reset stream eof after parsing header, fixes bug #218reimar2005-01-231-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14582 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix channels, sample rate and sample size for 3gp filesrtognimp2004-12-291-8/+26
| | | | | | | Patch by Richard van der Hoff [ richardv at mxtelecom dot com ] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14280 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix position bar and length display for mov filesreimar2004-12-211-6/+50
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14199 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle raw yv12 video as I420 to fix some Broadcast 2000 created samples.diego2004-12-181-0/+3
| | | | | | | patch by Reza Jelveh, approval by Roberto git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14180 b3059339-0415-0410-9bf9-f77b7e298cf2
* Extended support for other object type IDs in the ESDS. This enables e.g. ↵mosu2004-11-151-1/+8
| | | | | | MPEG2 video in the MP4 container. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13955 b3059339-0415-0410-9bf9-f77b7e298cf2
*