Commit Graph

2562 Commits

Author SHA1 Message Date
reimar a4147be5f7 Fix memleaks caused by missing vorbis/theora_info/comment_clear calls.
Code still seems wrong to me for multiple audio tracks, since there is
only one vorbis comment/info entry for the demuxer, not one per track?


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21516 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 10:46:50 +00:00
nicodvb e704821b75 disable telecining when it can't be applied
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21502 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 22:08:11 +00:00
nicodvb a176dc29b9 since display_frames in increased by a possibly negative number it had better be signed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21501 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:58:07 +00:00
nicodvb 9e365b6032 cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21500 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:27:05 +00:00
nicodvb 7057e42777 removed dead code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21499 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:24:39 +00:00
nicodvb 8ec5a6a3ca reimplemented :telecine and :film2pal in terms of dgpulldown
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 21:20:01 +00:00
nicodvb 858813f36f pre-store in bff_mask the correct or-mask to be saved in the pce (slightly faster)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21497 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 20:38:46 +00:00
nicodvb 6dc68e8680 10l: wrong bitmask when patching the pce_ptr in soft_telecine()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21485 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 00:52:11 +00:00
nicodvb 2fded9964f added generalized teleciner by Donald Graft
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21483 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-04 00:02:15 +00:00
eugeni b5a682f0aa Rename: ass_process_font -> ass_add_font.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21471 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 17:35:40 +00:00
reimar 0639d41ffc Use libavutil LE_* macros instead of pointer casts which can result
in crashes due to missing alignment. Should fix bug #640.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21470 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 16:41:55 +00:00
nicodvb 6d8213c5d6 cosmetics: anti-chaos reindentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21464 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 12:06:08 +00:00
reimar 4a6ad7c674 Unicode support for demuxer info in ASF demuxer.
Patch by Zuxy Meng [zuxy meng <at> gmail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21461 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 11:35:11 +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
diego c00059b047 Remove suffix rules that are just copies of make builtin rules.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21436 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 12:08:25 +00:00
diego 44e2adf8d3 Use standard name for C++ flags.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21435 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-02 11:41:58 +00:00
nicodvb b5ecb3ba07 permit to specify the sizes of the decoders' buffers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21429 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 23:51:51 +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
diego b125a9e129 Add libav include paths to CFLAGS without indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21406 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-01 01:11:42 +00:00
reimar ef393a0650 Use av_int2flt/av_int2dbl to read float values. This is simpler and more
correct since it also works for int endianness != float endianness.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21404 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-30 17:55:00 +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 b7b22bd874 Remove some superfluous include CFLAGS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21390 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:14:03 +00:00
diego cac6c0eea2 Remove bswap.h, use libavutil/bswap.h instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 15:02:45 +00:00
diego 19300ef1db support for Westwood SND1 audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21378 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-29 10:51:39 +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 3adbef1c80 Use av_int2dbl to read doubles instead of our somewhat broken le2me_dbl
(le2me_dbl assumes float and int endianness are the same).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21363 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 19:01:04 +00:00
reimar 01755ed66a Remove long double reading code, long double was never used AFAICT and
is gone from the specification since a long time due to portability issues.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21360 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 18:34:08 +00:00
diego 31844ae22d cosmetics: Sort SRCS by alphabetical order.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21353 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-28 11:53:08 +00:00
diego 02436df5fc Split muxers into a separate library that only MEncoder is linked against.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21326 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 14:26:52 +00:00
diego f415c639b9 Move common code to mpcommon.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21323 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 13:32:24 +00:00
diego d4e86e6a11 Remove unnecessary header indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21305 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 02:20:15 +00:00
diego 42bf94ecc7 10l: Muxers were not being compiled even when MEncoder was enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21302 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 01:36:13 +00:00
diego a46183fb2c FFmpeg-style conditional dependency declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21291 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 22:37:03 +00:00
diego dc2be42703 Merge common parts of all Makefiles into one file included by all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21275 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 18:12:36 +00:00
diego c95db8d583 Simplify, remove useless indirection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21263 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-26 13:04:14 +00:00
reimar 53ba4dd6eb Cleanup for uselessly complicated closed-caption subtitle handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21252 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 22:06:00 +00:00
diego 27b0177662 Remove superfluous comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21222 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-25 16:12:36 +00:00
eugeni d8b0acaa87 Cosmetics: indentation fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21182 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-23 17:37:28 +00:00
nicodvb e9ca4efbc0 permit muxing to raw pes (VDR uses this)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21157 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 22:09:58 +00:00
diego d52d16f96e Remove superfluous empty variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21120 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-21 11:25:44 +00:00
nicodvb a9eada9189 check we aren't short of sh_videos before allocating another one
and fail if the allocation doesn't succeed;
added support for video stream switching


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21116 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 23:31:01 +00:00
nicodvb a6961fa26f slight simplification in demux_control_ts: no need to check *arg with last_{aid,vid} (small bugfix, too)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21115 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 21:03:46 +00:00
diego cf4bf03dc2 Unify dep/depend targets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21096 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 11:18:01 +00:00
uau 1390d0cf93 Reorganize code to move more things out of main().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21093 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-20 09:12:07 +00:00
nicodvb 07ccc9193c in demux_ts_control unified SWITCH_AUDIO and SWITCH_VIDEO (they were identical)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21088 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:36:14 +00:00
nicodvb f12bae62c0 during DEMUXER_CTRL_SWITCH_x *arg set to -2 identifies 'disable stream x'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21083 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:10:30 +00:00
reimar e22ab31677 10l, compilation error in r21054
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21055 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:35:39 +00:00
reimar b38e1ca6e7 Generalize subtitle switching, demux_ogg does not need a special case
anymore and demux_mov works now, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:23:54 +00:00
reimar 8f14f6d551 Make -slang work again, sub->id is -2 by default, so -slang would be ignored
with old code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21052 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 13:38:37 +00:00
reimar ceecfca462 Create a sh_sub_t for ogg subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21051 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 13:12:46 +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
ods15 7a06410d18 fix demux_nut to give proper (estimate) of percent position after a seek
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21039 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 20:44:22 +00:00
ods15 75c1fd9c1d Add disabled EAGAIN testing code for libnut
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21038 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 20:13:18 +00:00
ods15 24be79ae8b move demux_nut priv calloc to init() instead of check_file()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21027 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 15:17:50 +00:00
nicodvb bdc75c29ae implemented DEMUXER_CTRL_IDENTIFY_PROGRAM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21022 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:32:14 +00:00
nicodvb c97dc5061d new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21021 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:31:31 +00:00
diego 67efdbe07a support for XAN DPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21006 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 11:24:09 +00:00
diego 2f67bb7b34 support for some more fringe formats, still buggy ..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20996 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 22:52:57 +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
ods15 4295799cf5 missed piece in update to libnut API - non negative errors
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20987 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 17:43:40 +00:00
diego 1fb5f0f90a support flic video through lavf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 10:35:10 +00:00
nicodvb c3530411cb COSMETICS: reformatted
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20971 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 22:09:24 +00:00
nicodvb 81173eeb6c restored circular looping when changing audio and video stream (previously broken)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20970 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 22:08:14 +00:00
nicodvb ced53d9d19 reset demuxer's buffered demux_packet after DEMUXER_CTRL_SWITCH_AUDIO
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20968 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:31:44 +00:00
nicodvb 6a0ab89e43 implemented DEMUXER_CTRL_SWITCH_VIDEO
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20967 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:30:35 +00:00
nicodvb 96e829fc9c added code to switch video stream
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:23:06 +00:00
diego 84c9fdbab0 cosmetics: Restore alphabetical order, align both tables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20960 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 13:15:05 +00:00
diego 0245dc0efc support for RoQ video and audio through libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20958 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:42:32 +00:00
diego 77b21dc757 support for Electronic Arts ADPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20957 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:33:12 +00:00
diego 25d71db765 support for Delphine CIN audio and video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20956 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 12:28:39 +00:00
ods15 f85f460eb9 update to libnut API, non-negative errors
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20954 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 07:07:22 +00:00
diego 199d26ea92 support for Interplay DPCM audio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20952 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 01:17:19 +00:00
diego ac47a614cd cosmetics: alphabetical order and prettyprinting for the CodecTag table
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20951 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:59:01 +00:00
diego d495a2823f support for Sierra VMD video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20950 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:56:35 +00:00
diego adf53a4caa Add support for Tiertex SEQ video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20949 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 00:20:55 +00:00
diego 61da56fefa Add support for Westwood IMA ADPCM audio.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20947 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 23:42:47 +00:00
ods15 41e99a2c76 update to libnut, no nut_skip_packet()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 11:36:22 +00:00
ods15 e7c9a5bbe4 update to libnut API, don't free the streams
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20941 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-15 11:26:05 +00:00
rtogni d4f55932c1 Don't spam the console with timestamps (non-error messages printed every
frame should be lower than V level)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20937 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:48:53 +00:00
rtogni 88990e297c Fix extradata passing to lavc RV20 decoder
Pass video codec extradata unchanged from demux_real, sync vd_realvid to 
the new format
Sync mkv demuxer to the changes above (cmsg24 extradata was totally 
broken before)
Detect cmsg24 size from extradata (was fixed)
Based on a patch by elupus >> elupus >a< ecce se <<


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20936 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 22:40:35 +00:00
ods15 214c8be4e1 update to libnut, add cache_syncpoints
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20925 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 17:00:47 +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
ods15 f916c5d0c4 update to libnut, rename nut.h->libnut.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20909 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:01:54 +00:00
reimar 59e83201dd Try to handle oversized asf headers by ignoring anything beyond the first MB
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20894 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 19:16:39 +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
reimar 48c301ddbc Move sh_sub_t to stheader.h, where all the other sh structs are defined
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20892 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 18:38:29 +00:00
reimar 89b0172dce Add forgotten new_sh_sub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20889 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:18:05 +00:00
reimar c5fa0bbf92 Make subtitle stream handling more similar to audio and video streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:15:23 +00:00
ods15 565a0e8e45 change include "nut.h" to <nut.h> to make gcc pick the correct nut.h for libnut de/muxer..
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20868 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 17:47:40 +00:00
nicodvb 6e28f63e36 consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 17:19:56 +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
nicodvb c42fa438f4 removed duplicated check in demuxer_seek_chapter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20857 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-11 13:57:09 +00:00
nicodvb 5c361eff9d in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call DEMUXER_CTRL_RESYNC to notify the demuxer of the change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20855 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-11 11:53:32 +00:00
ods15 acd40ca816 shut warning on "realloc undefined" in demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20831 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 07:46:07 +00:00
ods15 c29caa76bd update libnut API
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20830 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-10 07:32:01 +00:00
uau d1639ced67 Change some constants in pts arithmetic from float to double.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20811 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 01:52:11 +00:00
uau f037400b74 Changed code that used pts=0 in demux packets to indicate "not known".
Now demux_real should be usable with -correct-pts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20810 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-09 01:42:52 +00:00
gpoirier d8435fd9c6 Fix crash when attempting to seek in a streamed unseekable stream, like
mms://a632.v3306a.c3306.e.vm.akamaistream.net/7/632/3306/v1/multith.download.akamai.com/3306/2005/COMEDIE/1144-0186-001.wmv 
patch by alexandre % alex14fr A yahoo P fr %


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20808 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 23:54:21 +00:00
diego 508c93566d Move some FourCC values from libavformat/riff.c to our private mapping.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20776 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 10:49:34 +00:00
nicodvb 6200940dcb added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20765 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:55:49 +00:00
nicodvb 0fa1a3e4c6 now demux_seek() tries to seek aided by the stream layer, if possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20764 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:54:28 +00:00
nicodvb a46e8bb058 added definition of DEMUXER_CTRL_RESYNC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20763 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:51:18 +00:00
michael 1052ab502a fprintf -> mp_msg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20756 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 19:05:38 +00:00
mosu 9c4d028084 If parsing a seek head fails then mplayer should try continue parsing the file after the seek head.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20750 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 18:14:30 +00:00
reimar 8abf4e3f17 Add our own CODEC_ID -> fourcc translation tables so we do not need
to put them into ffmpeg.
Also adds support for S24BE and S8 audio formats, which fixes e.g.
http://samples.mplayerhq.hu/A-codecs/MACE/Bach1-1.aiff and
http://samples.mplayerhq.hu/MXF/ebu_small.mxf .


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20749 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 17:37:23 +00:00
reimar 4587221d67 Fix index-based seeking in audio-only files, fixes bug #621
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20728 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 20:29:29 +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
kraymer 66f0513be8 add MSGTR_MPDEMUX_MKV for demux_mkv.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20696 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 13:53:27 +00:00
nicodvb a28d7004b4 don't set the resolution for dvr-ms files: in the asf headers it seems to
be always set incorrectly; the decoder will deal with it much better.
Patch by John Donaghy (johnfdonaghy gmail com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20652 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 22:53:24 +00:00
nicodvb 0c1724959f a previous commit introduced a bug that prevented tables
from being parsed in the feeding phase;
removed useless debugs


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20524 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 22:02:10 +00:00
nicodvb 6d60c545d4 simplified assignment of subtitles stream in ts_parse()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20522 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 21:29:23 +00:00
rtogni 54abc1a05e Prevent segfault if video codec init fails
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20515 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 14:26:23 +00:00
reimar ec9819db2c Make sure we do not read beyond end of subtitle packet
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20510 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 13:17:26 +00:00
reimar 64e9d8fc97 realloc subtitle buffers since subcp_recode might have decreased their size.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20509 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 12:44:15 +00:00
reimar 99c0130bda Quick hack to implement percent-based seeking, also fixes seeking with gmplayer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20508 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 12:32:12 +00:00
nicodvb 3675d0466d handle broken ts packets before parsing the rest
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20506 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 11:17:28 +00:00
reimar 7d91ecbd14 Support new flac-in-ogg, fixes bug #229
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20505 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 11:05:49 +00:00
nicodvb edf75a6184 cosmetics: reformatted after previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20504 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 11:00:36 +00:00
nicodvb 891bd61076 1000l: fixed broken handling of the adaption field - part 2
The value of c must be between 0 and 183 inclusive; is c is 0
I can't skip c-1 bytes!


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20503 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 10:55:02 +00:00
nicodvb 4ea549d06f fixed mishandling of stream_read() (it doesn't necessarily return -1 in case of error)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20502 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 10:33:49 +00:00
nicodvb e534b4afa9 ts_parse() move section handling after stream_read() rather than repeating it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20501 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 10:23:15 +00:00
nicodvb cb54570f66 removed useless check: when is_start is set the size of the payload
can be at most 184 bytes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20496 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 17:51:32 +00:00
nicodvb feed289c95 in ts_parse() centralized stream_read()+stream_skip(); smaller and cleaner
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20494 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 17:42:25 +00:00
eugeni efea99c2c9 Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 15:07:18 +00:00
reimar e5d30923d1 Cleanup/simplify nsv check_file function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20489 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 11:01:18 +00:00
nicodvb 267ed8021e readability cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20488 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 10:59:17 +00:00
nicodvb fb8eec9d28 unconditionally assign the language code when available;
more simplifications


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20487 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 10:52:12 +00:00
reimar 8777fbb596 Better check for non-broken NSVf-header to avoid incorrect detection.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20486 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 10:44:45 +00:00
nicodvb c57f415693 reformatted ts_parse() after previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20483 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 09:52:19 +00:00
nicodvb de8cb3f35a removed unreachable code (when len=pes_parse2() returns 0)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20481 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 09:44:18 +00:00
nicodvb fd08f0490e 10l: fixed misplaced adaption field check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20480 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 09:03:51 +00:00
nicodvb 5f569045d4 removed commented crc32 code; I'll eventualy reuse the one in lavu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20479 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 08:56:44 +00:00
nicodvb b705af5710 slight simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20478 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 08:54:31 +00:00
reynaldo e2b9f14a02 add two missing checks - PATCH by Karolina Lindqvist AT kramnet-se
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20448 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-25 20:39:01 +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
nicodvb a5d54eea12 if no stream could be muxed flush_buffers() returns 0: prevents while(1) stall at the end
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20350 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-22 10:32:59 +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
reimar 08bea9d14d Try playing files with wrong wav header length, fixes riff_broken_hrdlen.wav
(bug #238)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20340 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 19:58:49 +00:00
reimar e87a925c4a Remove #ifdef HAVE_FLAC, it was never needed and nowadays is never defined.
Fixes http://samples.mplayerhq.hu/ogg/old_flac_in_ogg_flac_1_0_4.ogg


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20335 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 17:58:33 +00:00
reimar 2b13b3a6c8 Cosmetics: indentation fix indentation broken by last two demuxer.c commits
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20325 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:36:59 +00:00
reimar d42038edb9 Fix opening of demuxers without check_file function, broken by r20309.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20324 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:31:52 +00:00
reimar d4d22f49e9 Try other demuxers if open() fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20309 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-19 18:20:12 +00:00
reimar 325912bf97 redone subcp_recode: get rid of static buffer, skip lines that failed to
convert instead of removing all remaining lines and remove subcp_recode1
since subcp_recode should now work just as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20298 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-18 16:09:59 +00:00
nicodvb 73f0dec489 fixed corner case previously mishandled: don't play an audio only stream when
-nosound is specified 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20289 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-17 21:26:30 +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
rtogni 5ec2b9ca3a Fix timestamps for streams where kf_base gets negative
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20235 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 13:35:46 +00:00
reimar 2ec8dc1fec Implement -noidx since index can use quite a bit of memory, esp. when using valgrind.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20230 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 12:48:18 +00:00
nicodvb d944bfd221 during stream detection always parse ts_probesize bytes (even with -nosound set),
otherwise the demuxer may not have a chance to correctly identify the stream type
(e.g. H264 was misidentified as MPEG2 with -nosound set)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20219 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 09:29:02 +00:00
rtogni a743f34200 Remove useless assignements, thanks reimar for noticing them
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20204 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-14 00:43:28 +00:00
reimar aa5a9bc123 Cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20182 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 17:21:15 +00:00
reimar 280c746919 strncpy->strlcpy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20181 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 17:19:43 +00:00
reimar 74890695e8 Remove useless return; at end of function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20180 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 17:19:10 +00:00
reimar 7ef8e59e30 Simplify demux_mkv_get_sub_lang
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20179 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 17:18:20 +00:00
ptt 07198ca3ae modifications pointed out by reimar doffinger
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20174 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-12 14:11:39 +00:00
rtogni 1e418cb5f1 Remove old hack to search for .ar and VIDO, we know where they are
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20165 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 21:19:24 +00:00
ptt 68613bbee7 added OSD audio switching visualization
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20162 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 17:25:46 +00:00
reimar d0947a5bb7 More possible memleaks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20161 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 15:57:51 +00:00
reimar de216f1950 Avoid memleak on error while reading attachments or multiple
MATROSKA_ID_FILEDATA parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20160 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 15:47:37 +00:00
diego 155d28bf01 Remove duplicate min/max macro definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20159 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-11 15:28:54 +00:00
rtogni 25b5b62319 Allows up to 8 bytes of extradata for cmsg24
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20150 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 22:15:01 +00:00
rtogni d64ad3f125 Fix extradata lenght when adding cmsg24 data
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20149 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 21:37:06 +00:00
rtogni c1fff74704 Cleanup: remove some old commented out skips
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20148 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 21:29:15 +00:00
reimar 030b28b3ee Fix misdetection of http://samples.mplayerhq.hu/tta/tivo_misdetect.tta as TiVo file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20147 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 19:21:33 +00:00
reimar 6a4cc21801 Simplify (by using realloc with NULL parameter) and refactor code to grow
array in 32-increments


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20146 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-10 15:01:11 +00:00
rtogni af56e2e82e Fix problems on live streams with huge timestamps, causing overflows and
negative pts values. It also changes pts to double, since there is no 
enough precision in float to represent 32bit uint timestamps.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20145 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 20:00:02 +00:00
reimar bdc8d80e9b Free track->language before assigning new value
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20143 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 19:10:36 +00:00
reimar 5240b8bf98 Missing (in close function)/misplaced free for track structure itself.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20142 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 18:56:16 +00:00
reimar ccff4a6164 Free track data if error occurs while reading trackentry
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20141 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 18:48:55 +00:00
reimar 89ca5fd9b7 Free track encodings on error or demuxer close
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20139 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 18:28:58 +00:00
reimar 37f549101b replace malloc+memset by calloc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20136 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 18:00:54 +00:00
reimar 3b81347247 Remove cast of realloc result missed in last patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20135 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 17:48:43 +00:00
reimar 4f58754e78 Remove unneeded casts for malloc/realloc calls
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20134 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-09 17:41:37 +00:00
rathann 19f74e95b5 Fixes
mpeg_packetizer.c:145: warning: no return statement in function returning non-void

Approved by Nico.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20122 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 22:43:29 +00:00
reimar 611f88ab5b WavPack files contain a complete, valid RIFF tag, so use extension (.wv)
to give libavformat a chance before our audio demuxer


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20109 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 12:19:08 +00:00
reimar fa92a6aad5 Simplify: replace malloc + memset 0 by calloc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20078 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 21:31:21 +00:00
reimar 11e7ea9df4 Fix demux_demuxers seeking if the video demuxer does not set
demuxer->video->pts (e.g. lavf).
Previous code would start audio from beginning.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20077 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 21:28:55 +00:00
reimar 9b128fa2e4 Implement absolute and percent-based seek
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20076 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 21:25:22 +00:00
nicodvb c5cbf5efe6 Reset demuxer->sub (consistently with audio and video) after seeking and at the end
of demux_mpg_open() to prevent ghost packets. Patch by Olaf Mandel - olaf mandel name.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20011 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-01 09:33:23 +00:00
eugeni f7e89b57fa Add matroska v2 (SimpleBlock) support.
Patch by Federico Menarini (federico d menarini a gmail d com).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19983 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-25 21:17:43 +00:00
nicodvb bd40e0ea1d interpolate real fps of dvr-ms files using the extended stream properties.
Patch by John Donaghy - johnfdonaghy gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19967 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 15:19:48 +00:00
reimar 8e6272e832 Make fill_buffer function check for stream eof, fixes hang at eof (bug #580)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19966 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-24 14:26:31 +00:00
ods15 b45efb0eeb simplifications, any error from libnut is fatal
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19964 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 21:05:28 +00:00
ods15 dcc0b8e177 sync to new libnut
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 18:48:18 +00:00
reimar 32254e3cb6 Missing part of previous patch to demux_real.c (revision 19958)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19960 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 17:00:09 +00:00
reimar b6d6af240c int->unsigned to avoid crash to sign extension, partially fixes bug #580
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19958 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-23 16:43:57 +00:00
ods15 978ec64191 better rounding for audio_delay_fix in muxer_avi.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19932 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-22 10:27:17 +00:00
reimar b4056ef407 Try .mxf with libavformat first, works around a too greedy mpeg-demuxer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19930 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-22 09:48:41 +00:00
nicodvb bc996f4dee demuxer->movi_end is updated after ds_fill_buffer(),
this in demux_mpg_probe() end_seq_start must be assigned
after ds_fill_buffer


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19902 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-18 22:32:51 +00:00
ods15 2f07a40d8d conditional declerations are unnecessary
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19868 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 10:22:23 +00:00
ods15 1b8971d82e Add demux_nut to MPlayer repo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 09:32:28 +00:00
eugeni 13387709ef Fix r19815: mkv_d->duration could be assigned an uninitialized value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19818 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-13 02:02:17 +00:00
eugeni fa6bc3aa4f Fix seeking in Matroska files with non-default TimecodeScale value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19817 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 21:45:06 +00:00
eugeni ee0ac67094 Fix block duration calculation in mkv demuxer.
According to specs, BlockDuration value is based on TimecodeScale.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19816 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 21:40:01 +00:00
eugeni 3f1e7dd9a8 Fix movie duration calculation in case when TimecodeScale element comes after
Duration element.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19815 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 21:33:10 +00:00
diego c7ee94590a Support for variable fps OGM files, blessed by Moritz.
patch by Sergey Khlutchin, Elphel, Inc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19808 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-12 09:00:10 +00:00
reimar a498ea8eb8 Avoid division by zero DEMUXER_CTRL_GET_PERCENT_POS with only one frame by just
returning DONTKNOW. A better formula to calculate position would probably be a better
fix though.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19800 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-11 19:01:20 +00:00
rtogni 28d3865047 Use better resolution for pts computation.
Fixes desync in Real live streams with huge pts values


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19701 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-05 21:53:09 +00:00
nicodvb 244d6ad8e8 in fixup_vorbis_wf() set to 0 bitrates indicated as -1 (unspecified, according to the specs); patch by Andrew Savchenko - Bircoph list ru
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19700 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-05 20:18:42 +00:00
rtogni b19a9bf88d Workaround for live Real streams starting with nonzero pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19661 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-03 18:30:59 +00:00
reimar 2e802cf855 Fix crash on DEMUXER_CTRL_SWITCH_AUDIO introduced by aid_vid_mismatch patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19651 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-03 10:10:57 +00:00
eugeni cc29cb220f Add support for rendering matroska plaintext subtitles with libass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19649 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 20:46:26 +00:00
eugeni e12a9c7206 Matroska subtitles are always utf-8, no need to recode them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19648 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 19:55:45 +00:00
eugeni 1ad2da1fbb Fix read beyond the end of allocated memory block.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19647 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 19:51:26 +00:00
eugeni 62bfae1406 Display track names in matroska files.
Patch by Paul Lebedev _paul d lebedev a gmail d com_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19646 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 19:39:24 +00:00
nicodvb 549b7f03c8 forgotten to pass the crc32 be2me_32()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19643 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-02 19:00:30 +00:00
eugeni a12ab82a62 Extract "application/x-font" attachments from matroska, in addition
to "application/x-truetype-font". They usually contain Type1 fonts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19627 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 19:47:39 +00:00
diego 66b1d0d001 The FSF changed postal address.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19620 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-01 12:11:11 +00:00
nicodvb b792548aa7 include forgotten limits.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19617 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-31 21:26:02 +00:00
nicodvb 735e934c58 added lavfdopts to pass options to libavformat
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19604 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-30 22:25:40 +00:00
diego 368bf2263b Remove XMMS_CFLAGS from CFLAGS, the variable is never set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19558 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-27 20:17:19 +00:00
reimar ccf75d6711 Get rid of demux_aid_vid_mismatch mess.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 19:17:04 +00:00
nicodvb d8dab41707 don't try to autodetect aac in pes packets (the detection is prone to give wrong results); use the stream_type from the PMT instead
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19543 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 17:31:42 +00:00
diego ebacc18087 demux_avs compilation should depend on WIN32DLL support, not a linker flag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19500 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-22 23:18:58 +00:00
eugeni 5762122f37 SSA/ASS parser reworked, with 2 main results:
support for script embedded fonts (fonts, uuencoded directly into script) added;
matroska interface functions have got more sensible names.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-22 22:11:01 +00:00
nicodvb b38ff54517 100l: *chapter_name was copied from the pointer rather than strupd()-ed (and next free()d in mplayer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19485 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 19:52:11 +00:00
nicodvb b7b319395e demuxer_seek_chapter() returns informations about chapters count and name
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 19:19:00 +00:00
nicodvb 1870190d37 clarification in a comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19445 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 19:03:59 +00:00
nicodvb e8870c3db7 support relative seeking in the stream-driven case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19444 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 19:03:31 +00:00
nicodvb 01602c31b3 added first revision of demuxer_seek_chapter()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19441 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 16:48:22 +00:00
eugeni bdb9b1d5dc Fix seeking in matroska files when timecodes do not start from zero.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19436 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 12:20:43 +00:00
diego b02e7924b9 Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.
based on a patch by Vladislav Naumov, vladislav.naumov **at** gmail **dot** com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19426 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-17 17:19:56 +00:00
reimar 16793d27a7 Simplistic attempt to make H.264 over RTSP work.
Did not work for me, but reason is unclear.
This at least moves things one step step closer to working


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19421 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-16 23:40:51 +00:00
reimar 85d85da0f2 Update information and print new value when demux_info_add is called
twice for the same tag.
Should show currently playing title with Ogg streams.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19419 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-16 23:32:39 +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
michael b85ad74dc9 pass average bitrate from encoder to (lavf) muxer
this fixes some problems with muxing mp4 files for the psp


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19366 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-10 21:48:41 +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
eugeni 1de0c3327d Add matroska chapter seeking capability.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 18:55:34 +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
ben 2d112d6fe4 moved pnm.h to stream/ (where it belongs)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19317 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-04 16:55:48 +00:00
diego ab02002f0d Forgotten part of the LIVE555 configure test simplification.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19309 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-03 22:18:21 +00:00
ben e503389acf mf.[hc] belong to libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19306 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-03 19:31:36 +00:00
ben 8f8547ae86 removed deprecated test.c file from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19282 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 20:32:38 +00:00
ben 49867bd432 introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 17:39:17 +00:00
rtogni 1b397a5350 Remove useless include
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19272 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-30 22:54:27 +00:00
rtogni f29898360c Make some more function static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19271 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-30 22:54:07 +00:00
rtogni 0b85735f5d md5 result is 16 bytes, not 20
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19268 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-30 21:50:10 +00:00
ben 78a534a906 removed now useless duplicate includes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19267 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-30 21:49:37 +00:00
rtogni d01ad3b845 xor_table can't be NULL, remove useless check
make xor_table static


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19263 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-30 17:02:27 +00:00
rtogni 028454daf8 The real hash function is just a md5, replace with lavu code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19261 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-30 14:45:27 +00:00
nicodvb 53dead1f8b no need to reming the copyright with msg_(), the notice in the source is enough
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19257 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-30 08:15:59 +00:00
nicodvb 714109da01 re-added forgotten return in send_mpeg_lpcm_packet()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19249 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-29 18:41:25 +00:00
nicodvb 92c2148d7e final cleanup: implemented send_mpeg_pes_packet() and send_mpeg_lpcm_packet() using new send_mpeg_pes_packet_ll()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19248 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-29 18:39:07 +00:00