summaryrefslogtreecommitdiffstats
path: root/libmpdemux/aviheader.c
Commit message (Collapse)AuthorAgeFilesLines
* aviheader.c: silence a warningUoti Urpala2012-02-291-2/+4
| | | | libmpdemux/aviheader.c:235:7: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
* cleanup: some warning fixes and minor cleanupsreimar2011-06-291-1/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33399 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33400 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33421 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33425 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33426 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: remove more warningsClément Bœsch2011-05-021-2/+2
|
* aviheader.c: avoid using uninitialized data in an error casereimar2010-12-161-1/+3
| | | | | | Avoid using uninitialized data if index read does not return enough data. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32707 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_avi: Add WAVEFORMATEXTENSIBLE supportreimar2010-12-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32639 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)reimar2010-11-021-7/+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
* spelling fixessiretart2010-11-021-1/+1
| | | | | | | | | | Found by the Debian QA tool 'lintian' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31913 b3059339-0415-0410-9bf9-f77b7e298cf2 reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
* aviheader.c: Remove obfuscating use of le2me_32.reimar2010-11-021-6/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31681 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-12/+3
|\
| * Add header for AVI print functions; avoids many forward declarations.diego2010-02-181-11/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30631 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libmpdemux: Mark functions not used outside of their files as static.diego2010-02-171-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30612 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Restore collapsed whitespace in output messagesUoti Urpala2010-03-071-1/+1
| | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations.
* | Merge svn changes up to r30136Uoti Urpala2009-12-301-0/+1
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * Add support for parsing audio streams (though should be easy to extend to video)reimar2009-12-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | via libavcodec. Parsing can be done at the demuxer stage (currently disabled) or at the decoder (ad_ffmpeg, enabled). Should allow using the libavcodec AAC, DTS, ... decoders independent of container format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30055Uoti Urpala2009-12-181-5/+5
|\|
| * Do not modify priv->idx_pos when regenerating the index, use a localreimar2009-12-171-5/+5
| | | | | | | | | | | | | | | | | | variable instead. should fix seeking after starting playback with -force-idx broken by r29914. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30052 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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-7/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-8/+7
| |
* | Merge svn changes up to r29304Uoti Urpala2009-07-071-0/+17
|\|
| * Add standard license header to all files in libmpdemux.diego2009-05-081-0/+17
| | | | | | | | 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-25/+25
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-25/+25
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Mark some functions staticUoti Urpala2008-04-231-1/+1
|/ | | | | | These functions aren't used outside their file and have no prototype in any header. Based on a forgotten patch from 2006 by Stefan Huehner, (stefan huehner org).
* Set sh_video->format when parsing aviheader, otherwise it might neverreimar2007-12-011-0/+1
| | | | | | | be set correctly when using demux_demuxers (like with ogg stream in AVI). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25229 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check wLongsPerEntry before using it.reimar2007-09-131-5/+5
| | | | | | | | | | This fixes a potential crash for some values of it. As a side effect it works around broken callocs with an integer overflow vulnerability, but using MPlayer on such systems should never be assumed to be safe! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24447 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix detection of xan audio. -noidx or -forceidx still is necessaryreimar2007-08-011-0/+5
| | | | | | | to detect audio at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23985 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify: use FFMAXreimar2007-07-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23861 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some useless "extern" before function prototypesreimar2007-07-251-9/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23860 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use stream_read_qword_lereimar2007-07-141-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23779 b3059339-0415-0410-9bf9-f77b7e298cf2
* with -identify show audio and video id; patch by Andrew Savchenko (Bircoph ↵nicodvb2007-04-201-0/+2
| | | | | | 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
* Sanity-check sh_video->bih->biSizereimar2007-01-211-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21985 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
* 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
* Move initialization of sh_audio/sh_video members to aviheaderreimar2006-11-301-2/+6
| | | | | | | | where possible so that all a_streams[]/v_streams[] are initialized and switching becomes simpler. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21403 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove bswap.h, use libavutil/bswap.h instead.diego2006-11-291-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variables, patch by Stefan Huehner stefan at huehner org.diego2006-07-081-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential integer overflows in memory allocation.rtogni2006-06-041-1/+1
| | | | | | | Patch by Rich and me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
* make sure the indx chunk is big enough to hold the basic structure.iive2006-04-061-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18053 b3059339-0415-0410-9bf9-f77b7e298cf2
* use calloc instead of malloc - simplifies code and fixes overflow problems.reimar2006-04-061-6/+2
| | | | | | | Path by Bjorn Sandell (biorn at chalmers se) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18052 b3059339-0415-0410-9bf9-f77b7e298cf2
* zero sized frames are not keyframesmichael2006-04-061-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18051 b3059339-0415-0410-9bf9-f77b7e298cf2
* Limit the number of entires to the amount that does fit into the chunk.iive2006-04-061-0/+5
| | | | | | | the function need rewrite as it assumes quite many things that are not guaranteed by the specifications. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18050 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100L to who wrote this. Also fix broken headers while at it.albeu2006-03-291-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17991 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert printfs in aviprint.c to mp_msg and give the information printingdiego2006-03-271-19/+19
| | | | | | | functions in this file a verbosity_level parameter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17978 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert all if(verbose>X) to mp_msg_test calls.diego2006-03-241-8/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix -idx with ODML files (patch by Benjamin Zores < ben _at_ tutuxclan.org >)aurel2006-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17565 b3059339-0415-0410-9bf9-f77b7e298cf2
* massive attack: mp_msg printf format fixesrathann2006-01-121-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
* libmpdemux translatables to help_mp part 1 / mp_msg calls / try 2reynaldo2005-10-311-26/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16883 b3059339-0415-0410-9bf9-f77b7e298cf2
* memleak fix by bryanwilkerson WHIRLPOOL yahoo SPOT comhenry2005-06-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15739 b3059339-0415-0410-9bf9-f77b7e298cf2
* switch from DIVX -> FMP4 fourcc for libavcodecmichael2005-02-221-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14767 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use libc qsort to sort ODML index.reimar2005-01-021-40/+5
| | | | | | | Based on patch by phillip at phdcam dot com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14298 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix quicksort to avoid stack overflow and extreme runtimesreimar2004-12-311-6/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14288 b3059339-0415-0410-9bf9-f77b7e298cf2
* Index-Recovery cosmetixatmos42004-10-201-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13701 b3059339-0415-0410-9bf9-f77b7e298cf2
* Recover Keyframe-Index for XviD aswellatmos42004-10-181-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13672 b3059339-0415-0410-9bf9-f77b7e298cf2
* small fixesrathann2004-08-281-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13188 b3059339-0415-0410-9bf9-f77b7e298cf2
* We still need to make sure the upper 16 bits of dwFlags are clearedranma2004-06-301-2/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12738 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove borken index fixup (breaks more than it fixes)ranma2004-06-301-13/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12737 b3059339-0415-0410-9bf9-f77b7e298cf2
* If we don't have a NEWAVIINDEX chunk, but have an OpenDML index,ranma2004-06-291-0/+7
| | | | | | | | use it even if there is no AVIX RIFF-Chunk. (See also <40D2E910.2000708@comcast.net> "Non-seeking OpenDML AVI") git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12729 b3059339-0415-0410-9bf9-f77b7e298cf2
* Only use odml index for files that need itranma2004-04-301-4/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12363 b3059339-0415-0410-9bf9-f77b7e298cf2
* forgot to commitalex2004-04-291-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12343 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't use odml when we don't have to -- the code is buggy!rfelker2004-04-271-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12330 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use aspect from encoder for AVI vprp headerranma2004-03-241-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12062 b3059339-0415-0410-9bf9-f77b7e298cf2
* Better vprp aspect fixranma2004-03-221-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12054 b3059339-0415-0410-9bf9-f77b7e298cf2