Commit Graph

109 Commits

Author SHA1 Message Date
reimar fe6c4fcae2 cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)
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
2010-11-02 04:16:46 +02:00
reimar ce19a13986 asfheader, demux_audio: Remove some pointless be2me/le2me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31685 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02: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 acdce0176a Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
Uoti Urpala c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
tack cc8a878a9c Get the proper codec id when a WAVE_FORMAT_EXTENSIBLE extension exists in a
wave file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30709 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:27:32 +00:00
diego 0055441774 Add header for AVI print functions; avoids many forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30631 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 00:18:50 +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
Uoti Urpala e1ecc43152 Merge svn changes up to r29684 2009-09-16 22:28:12 +03:00
reimar bd44692ac7 Get rid of useless indirection and use the demuxer argument directly instead of
ds->demuxer.
This makes it also work again with -audiofile without having to add more hacks to
demux_demuxers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29677 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-14 08:51:00 +00:00
Uoti Urpala d6c410b54c Replace libavutil internal header #includes with MPlayer copies
Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h
and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/
instead.
2009-07-26 06:16:43 +03: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
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
reimar 49eb5ef4dd Use 64 bit numbers for file positions in the seek function in audio demuxer.
Hopefully fixes seeking in wav files in-between 2 and 4 GB.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27938 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-16 10:20:58 +00:00
cehoyos a6b9c80b25 Remove unused line (and fix an icc warning).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27739 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 17:10:31 +00:00
ptt aba5ea4a69 changed 'Audio file' to 'Audio only' (to not get 'Audio file file' when played)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27365 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-29 11:17:52 +00:00
reimar 468f0e9763 100l, do not use macros on functions that are not idempotent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27275 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-13 16:56:00 +00:00
reimar 3ee9460505 Correct stream-seekability tests in demux_audio and demux_lavf
Based on a patch by Alexander Kanavin (alexander.kanavin nokia com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27250 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 17:25:37 +00:00
reimar 8833f7c4ce Only read wav header cbSize when there is enough space in header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27249 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-10 20:10:11 +00:00
reimar 646838e446 100l, assignment introduced in r27246 was exactly the wrong way around.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27248 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-10 20:06:43 +00:00
reimar 6f96a10094 Cosmetics: reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27247 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-10 19:30:23 +00:00
reimar bbb598b9eb Clean up reading of wav extradata.
Fixes bug #1135


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27246 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-10 19:29:02 +00:00
reimar 2293c79521 Make sure we do not use uninitialized data in case of a short read.
Not really relevant but fixes bug #1109


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27143 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 07:34:44 +00:00
reimar efeb534cc8 Continue detection if it is not clear if we have a MP3 or flac file.
Fixes http://samples.mplayerhq.hu/A-codecs/MP3/01%20-%20Charity%20Case.mp3


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26844 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-21 16:07:37 +00:00
reimar 71ed16bbb4 Remove another two useless special-case from flac metadata reading function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26408 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:16:37 +00:00
reimar 4d4cb3a3f2 Simplify: use AV_RB24
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26407 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:14:02 +00:00
reimar 84121288c1 Remove useless checks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26406 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:11:03 +00:00
reimar 88584511ff Simplify (currently disabled) get_flac_metadata
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26405 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:09:40 +00:00
reimar 933277ac0f Add a comment to the #if 0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25926 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:44:55 +00:00
reimar c6894da2cd Disable reading of flac metadata, mere metadata is not worth such a mess.
If you want this, fix the implementation to not crash at least occasionally,
or wait till I get bored enough to fix it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25918 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:04:46 +00:00
reimar 80d22ebb9f Properly check length of flac metadata.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25917 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:00:58 +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 eb6b6698a1 Fix endless loop if nAvgBytesPerSec is 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25800 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 14:43:58 +00:00
reimar fd35d1bfe3 Avoid a division by 0 if i_bps is 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25799 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-19 14:38:24 +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 e907bda20a Simplify: initialize at declaration at the start of the function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24612 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 22:21:14 +00:00
reimar fc686f0d6d Get rid of rather pointless asserts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24611 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 22:18:47 +00:00
uau b12a08fe6a demux_audio.c: Fix timestamp handling
The code calculated the pts values of audio packets by adding the length
of the current packet to the pts of the previous one. The length of the
previous packet should be added instead. This broke WAV timestamps near
the end of the stream where a short packet occurs.

Change the code to store the pts of the next packet instead of the last
one. This fixes the WAV timestamps and allows some simplifications.
MP3 timestamps are not affected as packets are always treated as
constant decoded length, and FLAC timestamps still have worse problems
(FLAC is treated as as if it was constant bitrate even though it isn't).

Also store the timestamps as double instead of float.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24609 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-24 21:49:56 +00:00
reimar 33d26c72cf Get rid of: useless variable, useless cast and void * arithmetic
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23648 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 13:21:50 +00:00
reimar 4badc643ae Use AV_RL32
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23647 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 13:20:17 +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 ec62af965e Check for eof in loop searching for data chunk.
Fixes bug #775.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22604 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 10:38:51 +00:00
reimar e1b26346cc Fix wrong setting of samplesize (must be bytes per sample, not bits)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22437 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 12:43:55 +00:00
reimar 8fdb1522a2 Do not read beyond end of data chunk if chunk_size is set.
Sample: http://samples.mplayerhq.hu/A-codecs/wavpcm/ahh.wav


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22121 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-04 09:33:57 +00:00