diego
473e2824cb
Rename all preprocessor directives related to Apple / Mac OS X.
...
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 07:42:26 +00:00
diego
4b141479da
Start unifying names of internal preprocessor directives.
...
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 12:01:30 +00:00
reimar
b422b105d7
And a 1000l for r27263, swapped a condition, thus setting size to
...
0 when malloc succeeded instead of when it failed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27304 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 17:48:34 +00:00
reimar
2f5b26277f
100l, fix calloc being called with the wrong argument due to reordering
...
two lines in SVN r27263
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27303 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-16 17:28:19 +00:00
reimar
95cee5309f
Change a broken check. FFMAX does not work as intended because trak->chunkmap[i].first
...
is unsigned and j is signed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27280 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-14 15:49:59 +00:00
reimar
c0455325f0
Reindent after last commit
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27266 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 22:04:29 +00:00
reimar
d8b29c80d5
Check size of tkdata before using it in mov demuxer.
...
Fixes bug #1170 and others.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27265 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 22:03:01 +00:00
reimar
49ddf2e0f5
Add atom_len sanity check to mov demuxer.
...
Fixes bug #1168
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27264 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 21:59:17 +00:00
reimar
baae5f1bdd
Quick hack to fix demux_mov crashes where easily possible.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27263 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 20:22:07 +00:00
reimar
869e44fdcc
Check stdata_len before accessing stdata. Fixes bug #1125
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27194 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:47:31 +00:00
reimar
d5e01cffea
Do not use stdata before checking its length
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27142 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 07:25:47 +00:00
diego
0e5800b7e5
Use HAVE_QUICKTIME instead of MACOSX preprocessor condition.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26249 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 11:32:19 +00:00
reimar
fa054564d7
Use AV_RB*, reduces x86_64 code size by almost 1kB.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25963 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-09 10:38:36 +00:00
reimar
511eccaa78
Check that index is still within bounds of samples array.
...
Previous check is not enough and the code is not performance critical
so do it the easy way.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25922 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:14:00 +00:00
reimar
80e4c5d665
Make sure chunkmap values are within bounds when using them.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25921 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:13:47 +00:00
reimar
fe9225b50c
Do not pointlessly read data, just skip it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25920 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 22:13:20 +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
4ddc96baae
Support mov subtitle format directly instead of converting to text in the demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25883 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-27 16:13:21 +00:00
reimar
3560751199
Simplify init_vobsub: pass palette via extradata.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25873 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 23:52:15 +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
f9e6def939
Codecdata must always be malloc'd, fixes free being called with an
...
invalid pointer when freeing codecdata.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25658 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-09 07:18:14 +00:00
cehoyos
5eaf53d925
Cosmetics: Fix indentation.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25388 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-14 07:15:13 +00:00
cehoyos
5b122fd41a
Set correct image format for 24bit "raw " in mov files.
...
Patch by Chas Williams, chas A cmf D nrl D navy D mil
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25387 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-14 07:14:33 +00:00
diego
0723947265
warning fix:
...
demux_mov.c: In function 'mov_check_file':
demux_mov.c:504: warning: label 'skip_chunk' defined but not used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24378 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-09 09:54:57 +00:00
reimar
8138eb7b5f
Split lschunks function further, it is simply too huge to do any useful changes (e.g. for
...
more proper support for multi-codec tracks).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24202 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 18:09:00 +00:00
diego
6f33963721
warning fix:
...
demux_mov.c:44: warning: redundant redeclaration of 'vo_sub'
../libvo/sub.h:64: warning: previous declaration of 'vo_sub' was here
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24192 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 16:56:43 +00:00
cehoyos
7a640111d4
10l: r23399 broke mov/mp4 demuxing
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23402 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 14:25:48 +00:00
diego
5edd9af248
Remove some unused variables, patch by timwoj ieee org.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:42:35 +00:00
diego
56c96cec50
Declarations and code should not be mixed.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23107 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-25 00:03:27 +00:00
nicodvb
dfd0190a6d
with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23028 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-20 21:49:49 +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
uau
0f35f8354e
Fix audio samplerates below 7000 Hz.
...
Patch from John Koleszar, jkoleszar on2 com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22482 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-07 01:23:37 +00:00
reimar
4402f7d089
10l, avoid crash on invalid subtitle id
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22333 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 10:19:41 +00:00
diego
8ed3ba4995
cosmetics: typo fixes, usefuLL --> useful and aswell --> as well
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22307 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-22 00:18:10 +00:00
reimar
077f4e7a2c
English grammar fix: There is no 's' after "does not exist"
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22219 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-14 19:17:39 +00:00
reimar
c191199c18
100l copy-and-paste bug. Do not print video info when the problem is with subtitles
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22218 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-14 19:16:08 +00:00
reimar
d80d849ed7
Set sub_utf8 for mov subs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22152 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 18:12:56 +00:00
reimar
61e4a80191
Subtitle handling cleanup: factor out code for parsing embedded subtitles
...
and adding and removing of lines in subtitle struct into subreader.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21845 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-06 19:07:58 +00:00
diego
9c2d44923a
Remove superfluous bswap.h include.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21437 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:32:44 +00:00
uau
11d2b91f23
Fix 2 header bugs introduced by nplourde's previous commit:
...
#include "loader/qtx/qtxsdk/components.h" needs inttypes.h which was no
more implicitly included by earlier headers, and "#ifdef MACOSX" was
used before '#include "config.h"'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21370 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 23:53:07 +00:00
nplourde
cf332d16c2
reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21369 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 23:13:08 +00:00
reimar
5b391eb2a3
Support multiple subs in mov
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21048 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 11:55:03 +00:00
reimar
2bf9053a66
Try reading palette for vobsub
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20995 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 20:13:21 +00:00
reimar
99280ec76e
Pseudo-support for subtitles in http://samples.mplayerhq.hu/sub/jpn_engSUB_sample.3gp
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20992 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 19:16:07 +00:00
reimar
96ba82424f
10l copy&Ãpaste bug in subtitle sh handling
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20923 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 15:02:15 +00:00
reimar
fec63334f8
Incomplete support for vobsub (missing palette support) and
...
text (missing styles and edl support) subtitles in mov,
see also bug #611
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20893 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 18:41:24 +00:00
rtogni
1c4b71edd9
Add support for 13k Voice (Qclp) in 3g2 files
...
Fix vorbis detection so that it doesn't misdetect other codecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19369 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-11 22:57:33 +00:00
reimar
a6bc70e3cb
Support for version 1 (64 bit) mvhd and mdhd, taken from libavformat mov demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19349 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 19:26:17 +00:00
diego
67c9657f5d
Move store_ughvlc to demux_mov as demux_ogg is not always compiled in.
...
inspired by a patch from Emanuele Giaquinta, emanuele.giaquinta %@% gmail.com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19332 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-04 21:19:06 +00:00
nicodvb
2205e86985
auto-detection of mpeg-ps in mov; initial patch by John Koleszar jkoleszar on2 com (fixed by me)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19331 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-04 20:18:21 +00:00