aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux/demux_avi.c
Commit message (Collapse)AuthorAge
* demux_avi: remove pointless checksGravatar reimar2010-11-14
| | | | | | | 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 svnGravatar reimar2010-11-14
| | | | | | | | | | | [ 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")Gravatar diego2010-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | 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 r31004Gravatar Uoti Urpala2010-04-26
|\
| * Make audio switching with AVI demuxer chose the first audio streamGravatar reimar2010-03-31
| | | | | | | | | | | | | | 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 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
|\|
* | Merge svn changes up to r30595Gravatar Uoti Urpala2010-03-09
|\ \ | | | | | | | | | | | | | | | Conflicts: mplayer.c vidix/nvidia_vid.c
* | | translations: tweak cases that relied on concatenating adjacent stringsGravatar Uoti Urpala2010-03-07
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Add header for demux_ogg_open, init_avi_with_ogg; avoids forward declarations.Gravatar diego2010-02-17
| | | | | | | | | | | | 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.Gravatar diego2010-02-17
| | | | | | | | | | | | 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.Gravatar diego2010-02-17
| |/ | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30612 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make len unsigned. More correct anyway and avoids sign extension to 64 bitGravatar reimar2010-02-14
| | | | | | | | | | | | | | for the 64+32 bit addition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30584 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify.Gravatar reimar2010-02-14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30580 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29962Gravatar Uoti Urpala2009-11-23
|\|
| * Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too manyGravatar reimar2009-11-22
| | | | | | | | | | | | | | 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.Gravatar reimar2009-11-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29914 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try to detect broken files with unaligned chunks.Gravatar reimar2009-11-16
| | | | | | | | | | | | | | | | | | 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
* | 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.
| | * 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
* | Merge svn changes up to r28310Gravatar Uoti Urpala2009-01-15
|\| | | | | | | | | | | | | | | 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.Gravatar reimar2009-01-01
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28224 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Gravatar Uoti Urpala2008-12-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2008-12-03
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make various functions staticGravatar Uoti Urpala2008-08-12
| |
* | Merge svn changes up to r27399Gravatar Uoti Urpala2008-08-02
|\| | | | | | | | | | | | | | | | | | | 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_Gravatar diego2008-08-02
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 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).
* | Add option pointer to demuxers and stheader.h structsGravatar Uoti Urpala2008-04-23
|/
* cosmetic typo fix, geneate > generateGravatar compn2008-02-09
| | | | 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.Gravatar reimar2008-01-29
| | | | | | | | 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 .rodataGravatar reimar2008-01-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some pointless castsGravatar reimar2007-12-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25228 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
* Support some weird AVI header, fixes bug 742Gravatar reimar2007-02-06
| | | | | | | (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/FFMAXGravatar reimar2006-12-01
| | | | 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 shouldGravatar reimar2006-12-01
| | | | | | | 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 availableGravatar reimar2006-12-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21420 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement stream switching for AVI demuxer.Gravatar reimar2006-12-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21419 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 duplicate message, the same info is printed anyway.Gravatar diego2006-11-12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20863 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix an obvious typo.Gravatar eugeni2006-11-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20716 b3059339-0415-0410-9bf9-f77b7e298cf2
* better wording for "workarounding"Gravatar kraymer2006-11-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20712 b3059339-0415-0410-9bf9-f77b7e298cf2
* MSGTRs for demux_avi.cGravatar kraymer2006-11-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20711 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow lowercase letters in AVI stream id, fixes bug #277Gravatar reimar2006-10-23
| | | | 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,Gravatar reimar2006-10-21
| | | | | | | audio was not correctly disabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20343 b3059339-0415-0410-9bf9-f77b7e298cf2