Commit Graph
66 Commits
Author SHA1 Message Date
Uoti Urpala 0e1b7765be Merge svn changes up to r29644 2009-09-04 19:49:35 +03:00
reimar 46a0ddd36e free(), delete and delete[] are all different and can't just be used at random,
so change code to use the one appropriate for the allocation used.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29627 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 11:07:02 +00:00
Uoti Urpala 95da34aa07 Merge svn changes up to r29532 2009-08-18 02:29:37 +03:00
cehoyos 226e5b47c8 Fix possible double-free.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29502 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-12 15:20:14 +00:00
cehoyos 36ebca92d2 Make *avcctx AVCodecContext instead of void.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29495 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 18:52:18 +00:00
cehoyos bb6c23de0c Fix a crash when playing some H264 over rtsp streams: Do pass an
AVCodecContext to the H264 parser.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29493 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-11 18:28:26 +00:00
Uoti Urpala a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +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
lu_zero 97b04458ed Unify over rtsp_transport_tcp as var to hold the -rtsp-stream-over-tcp flag and make sure libnemesi only builds are fine
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29322 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-25 20:28:35 +00: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
Uoti Urpala 52ee93c1c6 demux_rtp.cpp: Add missing #include 2008-12-02 23:09:07 +02:00
Uoti Urpala d8fad6cc3d demux_rtp.cpp: Fix compilation issues
This file hadn't been updated after some API changes.
2008-12-02 20:55:04 +02:00
Uoti Urpala 0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
attila 65e06f1c5f increase the max RTP packet size to 5MB as modern Elphel
cameras do produce such huge packets.
Requested by Alexandre Poltorak


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27810 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-22 16:08:26 +00:00
Uoti Urpala 04f3909a72 Merge svn changes up to r27374
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
2008-07-30 16:39:24 +03: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
Uoti Urpala 7039bc090a Add option pointer to demuxers and stheader.h structs 2008-04-23 13:41:05 +03:00
lu_zero 298578466c Rename demuxer tags to clarify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25298 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-04 15:26:56 +00:00
cehoyos 8d5573a14e Fix playback of streams with more than one video track (only one supported).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25265 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 18:04:14 +00:00
cehoyos e1fa5aef51 Fix playback of streams with more than one audio track (only one supported).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24618 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-25 22:34:01 +00:00
cehoyos 634dfcbed7 Simplify network timeout calculation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23589 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-20 10:39:57 +00:00
cehoyos 5763ed69ac Silence three warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23575 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 09:15:32 +00:00
cehoyos ed522600d8 Stop playing at eof or if no data arrives for ten seconds.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23574 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-18 08:53:53 +00:00
cehoyos fd7fa9ee0a Fix compilation after FFmpeg r8921
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23242 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-07 08:13:22 +00:00
cehoyos 0c3c6dd46e Use teardownMediaSession() instead of teardownMediaSubsession()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22911 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-03 17:00:27 +00:00
cehoyos 407c037cfb Support h264 over rtsp
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22870 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 03:03:05 +00:00
cehoyos 46fbb1bd66 Cosmetics: Move variable declaration and initialization up.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22869 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-01 03:00:47 +00:00
cehoyos a2177f8bfc Fix filepos calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22777 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-22 10:14:32 +00:00
nicodvb 8eee548895 cosmetics: renamed variable amr as headersize, more meaningful; patch by Carl Eugen Hoyos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22537 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 22:13:48 +00:00
nicodvb f1c7edfaa6 support for AMR; it works inserting in the first byte of the demux_packet
a 1-byte header that live555 seems to be stripping for some reason, although according
to the specs it should be there. Patch by Carl Eugen Hoyos.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22481 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-06 22:53:52 +00:00
nicodvb f6687e7a78 removed unused definition of insertRTPData(); it's not only unused,
but conceptually wrong as it passed extradata as first demux_packet
to the corresponding demux_stream. Patch by Carl Eugen Hoyos



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22472 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-05 22:23:30 +00:00
nicodvb 309dc7e6c6 implementation of DEMUXER_CTRL_GET_TIME_LENGTH and DEMUXER_CTRL_GET_PERCENT_POS; patch by the usual Hoyos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22373 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 22:25:00 +00:00
nicodvb e4fbdd185e 1000l, removed code that messed with the internals of demux_packet_t (but there's still more); patch by C.E.Hoyos fixed by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22371 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 21:16:54 +00:00
ben 3b2c495798 don't declare same global var twice (break live555 compilation)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18836 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-26 22:00:44 +00:00
bertrand 52dd75e903 Allows the LIVE555 library to forces the client's port to be used
when reading from an RTP/RTSP source.

Patch from Benjamin Zores <[email protected]> and Patrick Labatut <[email protected]>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17651 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-19 13:27:27 +00:00
rsf b383ffa4b7 "LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16573 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-23 22:35:04 +00:00
rtognimp cd68e1618b Demuxer modularization
Demuxer selection by name with -demuxer command (bakward compatible)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
nicodvb 83b3c822be ported all network streams to the new API
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15586 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-29 12:54:00 +00:00
rsf a26dcc7b48 Updated to conform to a small change in the LIVE.COM API.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12867 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-20 02:12:08 +00:00
diego 19cf857451 MinGW compilation fix from a patch by Joey Parrish, approved by Sascha
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12532 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-03 13:30:55 +00:00
rsf 4d0be09a5d Added "audio_id", "video_id", "dvdsub_id" to the call to "demux_open()".
(Thanks to Nico Sabbi for suggesting this.)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12522 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-02 06:48:25 +00:00
rsf 7611ee601e Fixed a bug that was accidentally introduced by the addition of MPEG Transport
Stream support.  We now handle errors such as 'stream not found' correctly once
again.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12044 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-19 10:15:41 +00:00
rsf 162310efe9 We now allow for the possibility of the RTCP audio/video synchronization being
incorrect.  (I encounted a stream for which this was the case.)  Now, if
audio and video are out-of-sync by >60 seconds, we assume that the RTCP
sync is incorrect, and we don't discard any packets.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12008 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-03-02 08:52:59 +00:00
rsf 4594011e67 Added support for multiplexed audio+video RTP streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11985 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-22 06:20:08 +00:00
rsf 3b8f28041c Changed to conform to recent changes to the "LIVE.COM Streaming Media" code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11756 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-06 09:30:27 +00:00
rsf d7f68d1212 Changed the criteria for when to drop RTP packets whose timestamp is too far
behind that of the other (audio or video) stream.  Now, this is done only
if both streams have been synchronized using RTCP.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10938 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-24 08:41:57 +00:00
rsf 4867e17bfa Added support for checking whether a RTP demuxer contains combined audio_video data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10478 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-27 10:15:10 +00:00
rsf a3b6526ac6 Added SIP (IP telephony) client support. (This was already supported in the
LIVE.COM libraries, so updating the MPlayer code to support it required
only relatively minor changes.)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10055 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-03 06:13:11 +00:00