summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_avi.c
Commit message (Collapse)AuthorAgeFilesLines
* demux_avi: remove pointless checksreimar2010-11-141-7/+6
| | | | | | | If audio_block_size is 0 that is a bug (and will result in a division by 0 in one case that does not check this), thus remove all checks for it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32623 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_avi: modify to avoid -aid problem in svnreimar2010-11-141-22/+29
| | | | | | | | | | | [ Note: the questionable changes in svn that triggered this problem were never included in git, and so this commit is not strictly necessary here. It's included to reduce the differences between git and svn demux_avi versions. ] Fix possible division by 0 if -aid is used for AVI files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32622 b3059339-0415-0410-9bf9-f77b7e298cf2
* printf format fixes ("%d" -> "%zd")diego2010-11-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Add 'z' length modifier to %d printf format specifier for size_t argument. stream/http.c:675: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31933 b3059339-0415-0410-9bf9-f77b7e298cf2 Add 'z' length modifier to %d printf format specifiers for size_t arguments. libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 5 has type 'size_t' libmpdemux/demux_avi.c:553: warning: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31935 b3059339-0415-0410-9bf9-f77b7e298cf2 Add 'z' length modifier to %d printf format specifiers for size_t arguments. libmpdemux/demux_lmlm4.c:75: warning: format '%d' expects type 'int', but argument 5 has type 'ssize_t' libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 6 has type 'ssize_t' libmpdemux/demux_lmlm4.c:163: warning: format '%d' expects type 'int', but argument 7 has type 'ssize_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31937 b3059339-0415-0410-9bf9-f77b7e298cf2 Add 'z' length modifier to %d printf format specifier for size_t argument. stream/asf_streaming.c:676: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31938 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31004Uoti Urpala2010-04-261-1/+1
|\
| * Make audio switching with AVI demuxer chose the first audio streamreimar2010-03-311-1/+1
| | | | | | | | | | | | | | if audio is disabled instead of ignoring the request. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30979 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-11/+11
|\|
| * Add header for demux_ogg_open, init_avi_with_ogg; avoids forward declarations.diego2010-02-171-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30627 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add read_avi_header() to aviheader.h; avoids forward declarations.diego2010-02-171-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30623 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libmpdemux: Mark functions not used outside of their files as static.diego2010-02-171-5/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30612 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30595Uoti Urpala2010-03-091-2/+3
|\| | | | | | | | | | | Conflicts: mplayer.c vidix/nvidia_vid.c
| * Make len unsigned. More correct anyway and avoids sign extension to 64 bitreimar2010-02-141-1/+1
| | | | | | | | | | | | | | for the 64+32 bit addition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30584 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify.reimar2010-02-141-2/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30580 b3059339-0415-0410-9bf9-f77b7e298cf2
* | translations: tweak cases that relied on concatenating adjacent stringsUoti Urpala2010-03-071-3/+7
| | | | | | | | | | | | | | | | Tweak some code parts that used to rely on string literals from translation macros being concatenated with other adjacent string literals. Break up the resulting string into independently translated parts, so that the existing translations for those parts can still be used.
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-24/+18
|\|
| * Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too manyreimar2009-11-221-3/+3
| | | | | | | | | | | | | | name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use calloc instead of initializing each struct member individually to 0.reimar2009-11-161-22/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29914 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try to detect broken files with unaligned chunks.reimar2009-11-161-0/+15
| | | | | | | | | | | | | | | | | | This patch hopefully makes them playable as long as they have and index without breaking any other files. Fixes http://samples.mplayerhq.hu/avi/invalid_unaligned.avi with native demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29913 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-31/+31
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-31/+31
| |
* | Merge svn changes up to r29304Uoti Urpala2009-07-071-1/+20
|\|
| * Add standard license header to all files in libmpdemux.diego2009-05-081-1/+20
| | | | | | | | 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-12/+12
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-12/+12
| | | | | | | | | | 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 r28310Uoti Urpala2009-01-151-2/+17
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Make AVI demuxer more resilient against broken or incomplete files.reimar2009-01-011-2/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28224 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-031-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make various functions staticUoti Urpala2008-08-121-4/+4
| |
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Change a bunch of codec-specific preprocessor directives from a HAVE_diego2008-08-021-1/+1
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Mark some functions staticUoti Urpala2008-04-231-1/+3
| | | | | | | | | | | | 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).
* | Add option pointer to demuxers and stheader.h structsUoti Urpala2008-04-231-1/+2
|/
* cosmetic typo fix, geneate > generatecompn2008-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25964 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use defines to give names to the different seek flags.reimar2008-01-291-2/+2
| | | | | | | | 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
* Make all demuxer_desc_t const, thus moving them to .rodatareimar2008-01-131-5/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some pointless castsreimar2007-12-011-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25228 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
* Support some weird AVI header, fixes bug 742reimar2007-02-061-0/+3
| | | | | | | (http://samples.mplayerhq.hu/avi/samsung_crap_bug742.avi) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22166 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l confused FFMIN/FFMAXreimar2006-12-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21422 b3059339-0415-0410-9bf9-f77b7e298cf2
* Proper fix for last demux_avi commit, stream switching now really shouldreimar2006-12-011-8/+9
| | | | | | | not hang anymore git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21421 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make sure we do not hang if no streams are availablereimar2006-12-011-2/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21420 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement stream switching for AVI demuxer.reimar2006-12-011-0/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21419 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move initialization of sh_audio/sh_video members to aviheaderreimar2006-11-301-10/+0
| | | | | | | | 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 duplicate message, the same info is printed anyway.diego2006-11-121-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20863 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix an obvious typo.eugeni2006-11-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20716 b3059339-0415-0410-9bf9-f77b7e298cf2
* better wording for "workarounding"kraymer2006-11-051-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20712 b3059339-0415-0410-9bf9-f77b7e298cf2
* MSGTRs for demux_avi.ckraymer2006-11-051-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20711 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow lowercase letters in AVI stream id, fixes bug #277reimar2006-10-231-7/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20416 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid crash after "AVI: No audio stream found -> no sound." message,reimar2006-10-211-2/+2
| | | | | | | audio was not correctly disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20343 b3059339-0415-0410-9bf9-f77b7e298cf2
* as anounced, just some cleaning, purely janitorial changesreynaldo2006-10-151-81/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20252 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix calculation of stream sizes when they are too big for a 32-bit variablepacman2006-05-061-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18394 b3059339-0415-0410-9bf9-f77b7e298cf2
* dwStart support for mplayer.corey2006-02-181-0/+6
| | | | | | | | | | | | | | | | | | | * demux_avi sets stream_delay according to dwStart * mplayer adjusts audio_delay according to stream_delay 3 related patches are pending, and I will apply them over the next few days if all goes well. As I mentioned on -dev-eng, the funny indentation is in preparation for one of those pending patches. See: Date: Fri, 17 Feb 2006 00:53:28 -0800 To: mplayer-dev-eng@mplayerhq.hu Subject: [PATCH] bframes, dwStart: individual patches git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17644 b3059339-0415-0410-9bf9-f77b7e298cf2
* Second-try commit of this patch.corey2006-02-171-4/+5
| | | | | | | | | | | | 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-5/+4
| | | | 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-4/+5
| | | | | | | | | | | 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-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix crash if no video codec availablereimar2006-01-081-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17343 b3059339-0415-0410-9bf9-f77b7e298cf2
* move resync_audio_stream after seeking to demuxer.creimar2005-10-301-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid duplicated messages from demux_avi.c and demuxer.c.diego2005-09-131-10/+0
| | | | | | | patch by Luca Barbato < lu_zero -- at -- gentoo -- at -- org > git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16477 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make -identify's 'ID_LENGTH=' print a float and not an integer.. Theods152005-09-021-1/+1
| | | | | | | | accuracey may be totally fake for some demuxers (mpg), but accurate for others.. (avi) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l: fix avi demuxing for ni and nini cases, allow forcing ni and ninirtognimp2005-08-131-0/+39
| | | | | | | demuxers git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16212 b3059339-0415-0410-9bf9-f77b7e298cf2
* demux_avi_control() missing in avi's demuxer struct.ods152005-08-111-2/+2
| | | | | | | patch by Uoti Urpala (urpala BANG cc MEEP helsinki MEEP fi) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16200 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer modularizationrtognimp2005-08-051-2/+72
| | | | | | | Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move generic length and percent pos calculation to demuxer.creimar2005-01-151-3/+1