summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mov.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r29644Uoti Urpala2009-09-041-1/+1
|\
| * 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
* | Replace libavutil internal header #includes with MPlayer copiesUoti Urpala2009-07-261-1/+1
| | | | | | | | | | | | Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/ instead.
* | Merge svn changes up to r29412Uoti Urpala2009-07-071-1/+1
|\|
| * In all demux_info_add calls change "name" to "title".reimar2009-05-301-1/+1
| | | | | | | | | | | | | | | | | | Currently "name" and "title" are both used at random, this makes it consistent. "title" was chosen because it is less ambiguous and also the get_meta_title slave mode command uses that (there is no get_meta_name command). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29330 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-59/+59
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-59/+59
| |
* | Merge svn changes up to r29304Uoti Urpala2009-07-071-19/+40
|\|
| * Add standard license header to all files in libmpdemux.diego2009-05-081-19/+40
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-7/+7
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-7/+7
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r28951Uoti Urpala2009-03-141-1/+0
|\|
| * Remove unused variable from demux_mov.reimar2009-03-081-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28879 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-13/+14
|\|
| * Fix a couple of unused variable warnings through the av_unused attribute.diego2009-02-071-10/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28476 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert CONFIG_ZLIB into a 0/1 option.diego2009-02-071-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28475 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make various functions staticUoti Urpala2008-08-121-1/+1
| |
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * 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
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * 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
* | Merge svn changes up to r27332Uoti Urpala2008-07-211-2/+2
|\|
| * 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
* | Merge svn changes up to r27281Uoti Urpala2008-07-151-26/+29
|\|
| * 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
* | Merge svn changes up to r27202Uoti Urpala2008-07-051-0/+4
|\|
| * 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
* | Merge svn changes up to r27184Uoti Urpala2008-07-011-4/+5
|\|
| * 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
* | Add option pointer to demuxers and stheader.h structsUoti Urpala2008-04-231-1/+2
|/
* 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