Commit Graph

3050 Commits

Author SHA1 Message Date
reimar ae94f470b2 Make internal subtitle and subtitle switching work with -audiofile
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26849 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-21 18:45:30 +00:00
reimar 2bdedd33ed Use av_alloc_put_byte instead of custom protocol.
This needs less code and less hacks.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26848 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-21 18:21:05 +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
compn 3ea9517367 add ffmpeg ea maxis xa adpcm audio decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26792 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 23:31:05 +00:00
diego c4f6f66f9e cosmetics: Remove pointless parentheses from return statements.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26790 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:41:00 +00:00
diego 7c0eee9bce Remove unused function, fixes the warning:
libmpdemux/demux_mkv.c:2242: warning: 'demux_mkv_reverse_id' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26784 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-15 21:25:41 +00:00
diego 26166492dc Remove unused variable, fixes the warning:
libmpdemux/demux_mkv.c:1401: warning: unused variable 'mkv_d'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26782 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-15 15:54:17 +00:00
diego fddec2a0e2 cosmetics: Break overly long lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26781 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-15 13:52:44 +00:00
diego 0c5ff8e9d9 Mark static tables const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26780 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-15 13:48:23 +00:00
diego c733664aaf Mark files that were imported from the MJPEG Tools suite as such.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26777 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:16:38 +00:00
diego 0c6e4c6dbd 10l: Revert license header cleanup on imported files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26776 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:11:45 +00:00
diego 4adf8975a1 Use standard license headers with standard formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26774 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:01:51 +00:00
compn 3642bdba84 add rl2 codec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26767 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 13:56:14 +00:00
compn 6d1481e91b add ffptx , works on ptx samples
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26743 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-12 02:09:47 +00:00
diego f1579b88c9 cosmetics: wording/spelling fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26734 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 12:03:26 +00:00
michael 5f4cface7b AVOption support for lavf demuxing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26728 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:29:38 +00:00
michael 2ce3df53b1 AVOptions support for lavf muxing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26727 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:22:41 +00:00
michael 13b723459b Replace a really ugly hack by a clean but not thread safe solution.
(no threads so no problem anyway ...)
This fixes the segfault with lavf muxing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26722 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 17:19:18 +00:00
diego 96fa9c4e24 Mike Baker agreed to relicense his parts of the code as GPL v2+ on IRC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26680 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-07 08:01:51 +00:00
eugeni 547cc5772c Check ASF packet size before calling demux_asf_read_packet. Fixes segfault
with damaged ASF files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26644 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-02 13:33:14 +00:00
diego 7d560418f6 Remove unnecessary version.h #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26602 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-30 11:03:41 +00:00
diego aaf2c51e8a Merge libmpdemux/Makefile into top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 22:05:43 +00:00
diego 6a23615946 #include base64.h with full path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26518 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 16:49:31 +00:00
diego 9785107814 EXTRAXX_INC flags should now be added to .depend compilation,
not to the phony depend target.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26508 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 09:42:09 +00:00
reimar ea35e0563d Take audio delay into account when seeking in avisynth demuxer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26505 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 07:50:54 +00:00
reimar 4fd37efa40 Calculate fps as double-precision to make switching to double-precision fps values easier.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26504 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-23 07:49:51 +00:00
diego 41be611f0a .depend has to get all the CFLAGS that the files it contains dependency
information for need.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26500 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 22:14:06 +00:00
diego 6c2394f0b4 Add BFI video support through FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26491 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-22 10:14:55 +00:00
rtogni e37a6b5b58 Revert r26412: policy violation
Mixes cosmetics and functional changes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26470 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 16:53:44 +00:00
rtogni a8717a3eee Revert r26411: policy violation
Reindent of the file is not allowed
Controversial cosmetics changes with no previous discussion
Mix cosmetics and non-cosmetic changes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26469 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-19 16:51:28 +00:00
reimar 11b4999712 Prefer libavformat musepack demuxer over internal one (which does not even support v8).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26455 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-16 12:03:34 +00:00
uau c9e6af5949 demux_asf: Fix operator precedence in packet length check
Change (len & 3-1) to correct ((len & 3) - 1) in packet length check.
Also change "a - 1 < b" to simpler "a <= b".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26446 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 23:04:07 +00:00
uau aa5ecdffd5 demux_real.c: Always use MP_NOPTS_VALUE for unknown pts
demux_real.c still had code that used either 0 or MP_NOPTS_VALUE for
unknown timestamps depending on correct_pts setting. It should have
been removed in svn commit 25988 "Change to always use MP_NOPTS_VALUE
(instead of sometimes 0) for unknown pts.".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26413 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:51:15 +00:00
uau dd4bde7bc3 demux_mkv.c: Mark some static tables const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26412 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:51:11 +00:00
uau 9df7df5b5a Reformat demuxer.c
Indent with "indent -kr -l79 -nut" and fix various suboptimal results
by hand. Also remove some commented-out cruft and one unnecessary case
of parentheses as in "return (r)".

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26411 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:51:08 +00:00
uau 660ba18378 Remove global demuxer_type
It was only used inside one function. Change it to a local variable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26410 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 15:51:05 +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
uau c3f944e14a Remove unused function demux_read_data_pack
According to VCS history this function has never been used since it
was added in 2001...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26401 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 23:06:33 +00:00
diego d1ced77474 typo in filename
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26395 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 10:35:32 +00:00
diego 3ddde7648e Update comment to account for renamed header file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26393 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 09:50:24 +00:00
albeu 698142597e Split the lavf taglists out of the lavf muxer to allow using libmpmux
without libmpdemux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26360 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:46:21 +00:00
albeu 0359e6ddfb Split the aac header parsing out of aac demuxer to allow using libmpmux
without libmpdemux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26359 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:43:19 +00:00
albeu 64868a36cd Make stream independent of libmpdemux, the asf demuxer and streaming
code share a function and a few definitions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26357 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:32:35 +00:00
reimar 02fe2aae9f Fix lots and lots of other demuxers broken by r26301
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26331 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 14:11:48 +00:00
reimar 42234b5198 Remove another useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26330 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 14:07:34 +00:00
reimar 2ff97b7e85 Remove useless cast
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26329 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 14:07:05 +00:00
reimar af654481c0 Do proper parsing for DVR-MS files, this fixes playback with ffmpeg decoder
and also will create proper files when remuxing into e.g. AVI.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26328 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-05 11:09:21 +00:00