Commit Graph

95 Commits

Author SHA1 Message Date
diego 26541aeb8b printf format fixes ("%d" -> "%zd")
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
2010-11-02 04:15:48 +02:00
Uoti Urpala e913d6c5da Merge svn changes up to r31004 2010-04-26 17:55:05 +03:00
reimar c800858e60 Make audio switching with AVI demuxer chose the first audio stream
if audio is disabled instead of ignoring the request.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30979 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-31 18:45:00 +00:00
Uoti Urpala 00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala 42bf12c2d3 Merge svn changes up to r30595
Conflicts:
	mplayer.c
	vidix/nvidia_vid.c
2010-03-09 23:37:00 +02:00
Uoti Urpala b34a88e4f4 translations: tweak cases that relied on concatenating adjacent strings
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.
2010-03-07 21:35:23 +02:00
diego e01e094438 Add header for demux_ogg_open, init_avi_with_ogg; avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30627 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 23:36:44 +00:00
diego 965f604636 Add read_avi_header() to aviheader.h; avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30623 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 23:10:56 +00:00
diego eafb70de50 libmpdemux: Mark functions not used outside of their files as static.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30612 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-17 22:01:35 +00:00
reimar c2c64b459f Make len unsigned. More correct anyway and avoids sign extension to 64 bit
for the 64+32 bit addition.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30584 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 15:17:24 +00:00
reimar 5522068821 Simplify.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30580 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 14:48:54 +00:00
Uoti Urpala 5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
reimar af2988cbce Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
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
2009-11-22 15:18:21 +00:00
reimar 9a2be82856 Use calloc instead of initializing each struct member individually to 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29914 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-16 10:44:00 +00:00
reimar 4eac890e07 Try to detect broken files with unaligned chunks.
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
2009-11-16 10:41:06 +00:00
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Uoti Urpala 6d908205fb Merge svn changes up to r29304 2009-07-07 02:07:11 +03:00
Amar Takhar e306174952 Translation system changes part 2: replace macros by strings
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
Amar Takhar b5972d6f14 Translation system changes part 1: wrap translated strings
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
diego 6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
diego f077569dff Add standard license header to all files in libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-08 21:51:13 +00:00
Uoti Urpala 9bcd12fdf5 Merge svn changes up to r28310
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.
2009-01-15 05:57:31 +02:00
reimar 12b1fea30f Make AVI demuxer more resilient against broken or incomplete files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28224 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 11:39:47 +00:00
Uoti Urpala 8c144171bb Merge svn changes up to r28087
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
2008-12-04 01:55:52 +02:00
diego 0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
Uoti Urpala 6cce822505 Merge svn changes up to r27399
Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c
2008-08-02 22:04:35 +03:00
diego 96a506733d Change a bunch of codec-specific preprocessor directives from a HAVE_
prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 16:30:32 +00:00
Uoti Urpala 9e7dfe3fa3 Mark some functions static
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).
2008-04-23 13:48:38 +03:00
Uoti Urpala 7039bc090a Add option pointer to demuxers and stheader.h structs 2008-04-23 13:41:05 +03:00
compn 325b472ae6 cosmetic typo fix, geneate > generate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25964 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-09 13:13:02 +00:00
reimar 5960ddb8e5 Use defines to give names to the different seek flags.
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
2008-01-29 15:11:38 +00:00
reimar 35ef167321 Make all demuxer_desc_t const, thus moving them to .rodata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:00:39 +00:00
reimar 45cfc7af1a Remove some pointless casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25228 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 14:22:27 +00:00
diego e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
reimar db7e024216 Support some weird AVI header, fixes bug 742
(http://samples.mplayerhq.hu/avi/samsung_crap_bug742.avi)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22166 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-06 19:01:28 +00:00
reimar 24f3a0132c 100l confused FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21422 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 19:43:36 +00:00
reimar 0af2daec29 Proper fix for last demux_avi commit, stream switching now really should
not hang anymore


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21421 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 19:24:42 +00:00
reimar f32179337e Make sure we do not hang if no streams are available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21420 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 18:51:44 +00:00
reimar d441d65f34 Implement stream switching for AVI demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21419 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 17:57:29 +00:00
reimar 15eb8639c6 Move initialization of sh_audio/sh_video members to aviheader
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
2006-11-30 17:48:00 +00:00
diego 8619594a1d Remove duplicate message, the same info is printed anyway.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20863 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 16:03:39 +00:00
eugeni 8dc8dcf3cc Fix an obvious typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20716 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 17:32:18 +00:00
kraymer 09ebe87f57 better wording for "workarounding"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20712 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 16:49:09 +00:00
kraymer ea922ff669 MSGTRs for demux_avi.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20711 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 16:36:02 +00:00
reimar 0aa92466a1 Allow lowercase letters in AVI stream id, fixes bug #277
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20416 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-23 16:46:16 +00:00
reimar 3b248ecf24 Avoid crash after "AVI: No audio stream found -> no sound." message,
audio was not correctly disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20343 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 20:48:41 +00:00
reynaldo 8fcccd3090 as anounced, just some cleaning, purely janitorial changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20252 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 18:36:02 +00:00
pacman a2783c69ba Fix calculation of stream sizes when they are too big for a 32-bit variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18394 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-06 06:23:23 +00:00