Commit Graph

180 Commits

Author SHA1 Message Date
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
atmos4 7d2486e71e Add simple edit list support to mov demuxer, it supports delay of audio and video tracks at the beginning of the file. E.g. video starts at 0.0s audio at 4.0s. It uses mplayers a/v-delay to achieve sync so please use with -framedrop for fastest sync. More Details in my mail to dev-eng from 2006-07-22.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19175 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-23 22:34:02 +00:00
reynaldo 32492483c0 drops casts from void * on malloc/calloc from libmpdemux code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19067 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 16:41:13 +00:00
diego a356cbcc01 Remove unused variables, patch by Stefan Huehner stefan at huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 17:28:36 +00:00
uau 6723323303 Clean up audio pts handling, make audio pts tracking in the audio-only
case work the same as with video.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18713 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 19:48:54 +00:00
nicodvb d96e0e658a support for vorbis in mp4/mov
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18668 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-09 21:30:06 +00:00
rtogni 6f416d77ea Disable unsecure dumping of generic track with -v -v -v
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18584 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-05 19:00:23 +00:00
rtogni 9da9317579 Fix potential integer overflows in memory allocation.
Patch by Rich and me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18559 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-04 22:41:27 +00:00
rathann 9ebd30010f missing argument for mp_msg, fixes:
demux_mov.c:1159: warning: too few arguments for format


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18492 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-13 21:12:43 +00:00
rtognimp 5e86603495 Fix potential integer overflows in memory allocation. Patch by Reimar and me, SIZE_MAX by Rich
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18445 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-11 18:50:46 +00:00
rtognimp c96851a3f0 Partially revert 1.140, restoring the old behaviour for all codecs
except for twos and sowt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18219 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 11:38:06 +00:00
reynaldo c03b175452 Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of modifications as usual
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18177 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 05:12:10 +00:00
rtognimp 9c2deb1452 Fix passing qdm2 extradata to lavc decoder
It was broken in rev 1.142, that code does not behave the same as the
old one in some cases


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17983 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-27 21:37:18 +00:00
diego eebf08b978 Convert all if(verbose>X) to mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
rathann a3570cb3d7 le2me_32 is not necessary, tested by Diego on BE machine
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17861 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-14 00:02:42 +00:00
rathann 68f49b8512 in24/in32/fl32 little/big-endian QuickTime PCM audio support
approved by rxt


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17859 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-13 23:32:36 +00:00
diego 30d06685ac Reduce output verbosity in non-verbose mode, change some printf to mp_msg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17757 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-06 08:26:07 +00:00
rtognimp bf96c6033e This patch fixes pcm (twos, swot) in MOV.
This fix playing samples produced by ffmpeg(which set correct values),
and many samples in archive.

Patch by Baptiste COUDURIER | baptiste . coudurier )( smartjog . com |


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17717 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-02 22:28:12 +00:00