summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mov.c
Commit message (Collapse)AuthorAgeFilesLines
* Rename all preprocessor directives related to Apple / Mac OS X.diego2008-08-061-1/+1
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-3/+3
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* And a 1000l for r27263, swapped a condition, thus setting size toreimar2008-07-161-1/+1
| | | | | | | 0 when malloc succeeded instead of when it failed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27304 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, fix calloc being called with the wrong argument due to reorderingreimar2008-07-161-1/+1
| | | | | | | two lines in SVN r27263 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27303 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change a broken check. FFMAX does not work as intended because ↵reimar2008-07-141-2/+2
| | | | | | | | | trak->chunkmap[i].first is unsigned and j is signed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27280 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reindent after last commitreimar2008-07-111-9/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27266 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check size of tkdata before using it in mov demuxer.reimar2008-07-111-0/+2
| | | | | | | Fixes bug #1170 and others. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27265 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add atom_len sanity check to mov demuxer.reimar2008-07-111-0/+1
| | | | | | | Fixes bug #1168 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27264 b3059339-0415-0410-9bf9-f77b7e298cf2
* Quick hack to fix demux_mov crashes where easily possible.reimar2008-07-111-16/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27263 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check stdata_len before accessing stdata. Fixes bug #1125reimar2008-07-041-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27194 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use stdata before checking its lengthreimar2008-06-291-4/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27142 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use HAVE_QUICKTIME instead of MACOSX preprocessor condition.diego2008-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26249 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use AV_RB*, reduces x86_64 code size by almost 1kB.reimar2008-02-091-18/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25963 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check that index is still within bounds of samples array.reimar2008-01-291-0/+4
| | | | | | | | Previous check is not enough and the code is not performance critical so do it the easy way. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25922 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure chunkmap values are within bounds when using them.reimar2008-01-291-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25921 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not pointlessly read data, just skip it.reimar2008-01-291-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25920 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use defines to give names to the different seek flags.reimar2008-01-291-3/+3
| | | | | | | | A better solution should be considered later, esp. for the many broken demuxers that do not treat these flags correctly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support mov subtitle format directly instead of converting to text in the ↵reimar2008-01-271-9/+4
| | | | | | demuxer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25883 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify init_vobsub: pass palette via extradata.reimar2008-01-261-8/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25873 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make all demuxer_desc_t const, thus moving them to .rodatareimar2008-01-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
* Codecdata must always be malloc'd, fixes free being called with anreimar2008-01-091-2/+4
| | | | | | | invalid pointer when freeing codecdata. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25658 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: Fix indentation.cehoyos2007-12-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25388 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set correct image format for 24bit "raw " in mov files.cehoyos2007-12-141-1/+7
| | | | | | | Patch by Chas Williams, chas A cmf D nrl D navy D mil git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25387 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-09-091-1/+1
| | | | | | | | demux_mov.c: In function 'mov_check_file': demux_mov.c:504: warning: label 'skip_chunk' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24378 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split lschunks function further, it is simply too huge to do any useful ↵reimar2007-08-251-62/+72
| | | | | | | | | changes (e.g. for more proper support for multi-codec tracks). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24202 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-08-251-1/+0
| | | | | | | | demux_mov.c:44: warning: redundant redeclaration of 'vo_sub' ../libvo/sub.h:64: warning: previous declaration of 'vo_sub' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24192 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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 inc