aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux/aviheader.c
Commit message (Collapse)AuthorAge
* Rename directories, move files (step 1 of 2) (does not compile)Gravatar wm42012-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tis drops the silly lib prefixes, and attempts to organize the tree in a more logical way. Make the top-level directory less cluttered as well. Renames the following directories: libaf -> audio/filter libao2 -> audio/out libvo -> video/out libmpdemux -> demux Split libmpcodecs: vf* -> video/filter vd*, dec_video.* -> video/decode mp_image*, img_format*, ... -> video/ ad*, dec_audio.* -> audio/decode libaf/format.* is moved to audio/ - this is similar to how mp_image.* is located in video/. Move most top-level .c/.h files to core. (talloc.c/.h is left on top- level, because it's external.) Park some of the more annoying files in compat/. Some of these are relicts from the time mplayer used ffmpeg internals. sub/ is not split, because it's too much of a mess (subtitle code is mixed with OSD display and rendering). Maybe the organization of core is not ideal: it mixes playback core (like mplayer.c) and utility helpers (like bstr.c/h). Should the need arise, the playback core will be moved somewhere else, while core contains all helper and common code.
* options, avi: remove -loadidx/-saveidxGravatar wm42012-10-30
| | | | This was probably useless even many years ago.
* aviheader.c: silence a warningGravatar Uoti Urpala2012-02-29
| | | | libmpdemux/aviheader.c:235:7: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
* cleanup: some warning fixes and minor cleanupsGravatar reimar2011-06-29
| | | | | | | | | | | | 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 warningsGravatar Clément Bœsch2011-05-02
|
* aviheader.c: avoid using uninitialized data in an error caseGravatar reimar2010-12-16
| | | | | | 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 supportGravatar reimar2010-12-16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32639 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)Gravatar reimar2010-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 fixesGravatar siretart2010-11-02
| | | | | | | | | | 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.Gravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31681 b3059339-0415-0410-9bf9-f77b7e298cf2
* Delete things related to old translation systemGravatar Uoti Urpala2010-03-10
| | | | | 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 r30643Gravatar Uoti Urpala2010-03-10
|\
* | Restore collapsed whitespace in output messagesGravatar Uoti Urpala2010-03-07
| | | | | | | | | | | | | | | | | | 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.
| * Add header for AVI print functions; avoids many forward declarations.Gravatar diego2010-02-18
| | | | | | | | 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.Gravatar diego2010-02-17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30612 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30136Gravatar Uoti Urpala2009-12-30
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * Add support for parsing audio streams (though should be easy to extend to video)Gravatar reimar2009-12-27
| | | | | | | | | | | | | | | | | | | | | | 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 r30055Gravatar Uoti Urpala2009-12-18
|\|
| * Do not modify priv->idx_pos when regenerating the index, use a localGravatar reimar2009-12-17
| | | | | | | | | | | | | | | | | | 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 r29412Gravatar Uoti Urpala2009-07-07
|\|
* | Remove trailing whitespace from most filesGravatar Uoti Urpala2009-07-07
| |
* | Merge svn changes up to r29304Gravatar Uoti Urpala2009-07-07
|\ \
* | | Translation system changes part 2: replace macros by stringsGravatar Amar Takhar2009-07-07
| | | | | | | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | | Translation system changes part 1: wrap translated stringsGravatar Amar Takhar2009-07-07
| | | | | | | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
| | * In all demux_info_add calls change "name" to "title".Gravatar reimar2009-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2009-05-13
| |/ | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add standard license header to all files in libmpdemux.Gravatar diego2009-05-08
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Mark some functions staticGravatar Uoti Urpala2008-04-23
|/ | | | | | 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 neverGravatar reimar2007-12-01
| | | | | | | 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.Gravatar reimar2007-09-13
| | | | | | | | | | 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 necessaryGravatar reimar2007-08-01
| | | | | | | to detect audio at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23985 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify: use FFMAXGravatar reimar2007-07-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23861 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some useless "extern" before function prototypesGravatar reimar2007-07-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23860 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use stream_read_qword_leGravatar reimar2007-07-14
| | | | 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 ↵Gravatar nicodvb2007-04-20
| | | | | | 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.Gravatar diego2007-03-15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sanity-check sh_video->bih->biSizeGravatar reimar2007-01-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21985 b3059339-0415-0410-9bf9-f77b7e298cf2
* dont read index if -noidxGravatar michael2006-12-29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21788 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace another MIN macro by FFMINGravatar reimar2006-12-09
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21548 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move initialization of sh_audio/sh_video members to aviheaderGravatar reimar2006-11-30
| | | | | | | | 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.Gravatar diego2006-11-29
| | | | 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.Gravatar diego2006-07-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix potential integer overflows in memory allocation.Gravatar rtogni2006-06-04
| | | | | | | 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.Gravatar iive2006-04-06
| | | | 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.Gravatar reimar2006-04-06
| | | | | | | 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 keyframesGravatar michael2006-04-06
| | | | 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.Gravatar iive2006-04-06
| | | | | | | 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.Gravatar albeu2006-03-29
| | | | 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 printingGravatar diego2006-03-27
| | | | | | | 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.Gravatar diego2006-03-24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2