summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mov.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove some demuxers and decoderswm42012-07-301-2350/+0
| | | | | | | | | | | | | | | | | | Most of these demuxers and decoders are provided in better form by libav, while the mplayer builtin ones are essentially unmaintained. The only legimitate use case for not using the libav ones was working around libav bugs or bugs related to the way mplayer uses libav. Instead of trying to keep dead code alive, development effort should go into improving libav or the mplayer libav glue code. Note that the libav demuxer have been preferred over the mplayer builtin ones for a while in mplayer2. There were some exceptions: playing DVDs with dvdnav or playing network sources. (That's because some stream modules and network.c requested explicit file formats, such as DEMUXER_TYPE_MPEG_PS, which mapped to builtin demuxers.) With this commit, they are switched to use libav. One caveat is that the requested format is not passed to libavformat, instead we rely on the auto probing to select the correct libav demuxer (see code in demux_open_stream()).
* demux, vd_ffmpeg: fix demux keyframe flag, set AV_PKT_FLAG_KEYUoti Urpala2012-07-251-1/+0
| | | | | | | | | | | | | | | | | | There was some confusion about the "flags" field in demuxer packets. Demuxers set it to either 1 or 0x10 to indicate a keyframe (and the field was not used to indicate anything else). This didn't cause visible problems because nothing read the value. Replace the "flags" field with a boolean "keyframe" field. Set AV_PKT_FLAG_KEY based on this field in packets fed to libavcodec video decoders (looks like PNG and ZeroCodec are the only ones which depend on values from demuxer; previously this was hardcoded to true for PNG). Make demux_mf set the keyframe field in every packet. This matters for PNG files now that the demuxer flag is forwarded to libavcodec. Fix logic setting the field in demux_mkv. It had probably not been updated when adding SimpleBlock support. This probably makes no difference for any current practical use.
* build: switch to libavutil bswap.h and intreadwrite.hUoti Urpala2012-02-011-10/+11
| | | | | | | | | | | | Remove the private bswap and intreadwrite.h implementations and use libavutil headers instead. Originally these headers weren't publicly installed by libavutil at all. That already changed in 2010, but the pure C bswap version in installed headers was very inefficient. That was recently (2011-12) improved and now using the public bswap version probably shouldn't cause noticeable performance problems, at least if using a new enough compiler.
* cleanup: shut up more warningsClément Bœsch2011-05-061-1/+1
|
* sub/OSD: move some related files to sub/Uoti Urpala2011-01-261-1/+1
|
* demux_mov: fix possible hang on invalid inputreimar2010-12-161-1/+1
| | | | | | | len < 8 is also invalid for 64-bit codec chunk size. Previous code could cause hang. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32708 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_mov: fix some memory allocation handlingreimar2010-12-161-5/+13
| | | | | | | | Always free before overwriting a pointer with a newly allocated one, always use calloc instead of realloc when the previous data is not needed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32703 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)reimar2010-11-021-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32181 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32182 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32183 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace some sizeof(type) by sizeof(*pointer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32184 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32186 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32187 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32188 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizoef(type) by sizeof(*ptrvar). Besides being consistent with FFmpeg style, this reduces the size of a patch to rename these types to not conflict with the windows.h definitions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32189 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32191 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32192 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(type) by sizeof(*ptrvar) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32193 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a useless cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32194 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(type) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32195 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a useless cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32196 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace several sizeof(WAVEFORMATEX) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32197 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace one more instance of sizeof(WAVEFORMATEX); fix compilation. patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32199 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid some pointless uses of sizeof() and one related cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32200 b3059339-0415-0410-9bf9-f77b7e298cf2 Merge one malloc() + memset() invocation into calloc(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32202 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32203 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(WAVEFORMATEX) occurrences. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32205 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32206 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(BITMAPINFOHEADER) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32207 b3059339-0415-0410-9bf9-f77b7e298cf2
* Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* Merge svn changes up to r30643Uoti Urpala2010-03-101-0/+1
|\
| * Add header file for store_ughvlc(); avoids forward declarations.diego2010-02-171-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30622 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark mov_build_index() as static; it is not used outside of the file.diego2010-02-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30613 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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
| | | | |