69fe2522f8
Merge svn changes up to r30301
2010-01-25 15:07:30 +02:00
4b2e107710
Fix ftp support to properly support large files > 2GB.
...
Patch by Yuriy Kaminskiy [yumkam mail ru]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30418 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-24 10:13:33 +00:00
570f1f5dec
Always call cache_uninit to immediately free everything cache-related if we
...
fail to enable the cache.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30404 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 12:27:13 +00:00
73dea88956
Call cache-uninit unconditionally, it should always be safe to call.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30403 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 12:21:07 +00:00
4e28b4bc9e
Change code to allow playing a stream even if enabling the cache failed
...
while still handling it when the user aborts the cache fill.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30402 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 12:13:28 +00:00
0e86058912
Make cache_init static, it is not used outside this file
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30401 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 11:51:13 +00:00
03af209bf7
Handle Content-Length also when Content-Type is not set.
...
Based on patch by Yuriy Kaminskiy [yumkam mail ru]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30399 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 11:14:18 +00:00
e177aedfc1
Use atoll to parse Content-Length to support http for files > 2GB.
...
Patch by Yuriy Kaminskiy [yumkam mail ru].
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30398 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 11:08:45 +00:00
567a8d69a4
Add an exit() to silence a gcc warning and ensure forked code will never
...
leave the cache-loop function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30397 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 11:03:10 +00:00
a2d8222f3d
100l, shouldn't write to memory after freeing it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30396 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 11:00:13 +00:00
9869be806b
Reindent.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30395 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 10:54:03 +00:00
3fae575483
Zero freed pointers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30394 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 10:53:28 +00:00
7afaecc111
Check for fork failing and make sure cache_uninit always frees the cache data
...
even if fork failed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30393 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-23 10:50:50 +00:00
a0f08fbebb
stream: improve EOF handling in seeks
...
Reset stream 'eof' flag when a seek succeeds, and allow seeking to a
position at or past EOF (in the sense that the seek succeeds and
stream_tell() then returns that position).
This fixes at least some demuxer problems where an attempt to read
the index from the end of an incomplete file would set the 'eof' flag
and cause subsequent reads to fail, even if failure to read the index
would otherwise be nonfatal and demuxing could continue after seeking
back.
Partially based on a patch from Laurent <laurent.aml@gmail.com >.
2010-01-18 14:38:56 +02:00
77af8d0859
Add hack to fix tvi_dshow compilation with 64-bit MinGW
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30347 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 13:18:59 +00:00
abf7e21e79
Change GUID declarations in tvi_dshow so they are not exported and thus
...
will not cause clashes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30342 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-17 11:41:54 +00:00
33bc71f10d
Add support for distinguishing between little- and big-endian SPDIF AC3
...
and converting between both.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30283 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-11 20:27:52 +00:00
819b8f08a2
Merge svn changes up to r30236
2010-01-08 02:44:37 +02:00
852570d342
Merge svn changes up to r30216
2010-01-08 02:39:39 +02:00
17eb7f2c4b
Merge svn changes up to r30195
2010-01-08 02:06:42 +02:00
d157b2a8ce
Merge svn changes up to r30173
2010-01-08 01:17:56 +02:00
231b33a02f
Merge svn changes up to r30165
2010-01-08 01:05:30 +02:00
78267a4d21
Support rtmp:// URLs directly instead of requiring ffmpeg://rtmp://
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30232 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-06 16:12:58 +00:00
abb06b3f11
Simplify ffmpeg stream support, we (so far) do not need any special option parsing.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30231 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-06 16:11:29 +00:00
00ad5d3fed
Add a few missing header #includes and #defines.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30207 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 18:58:35 +00:00
348a61a71f
Disambiguate HEADER_SIZE definition in stream/librtsp and stream/realrtsp.
...
This fixes the warning:
In file included from stream/realrtsp/real.c:35:
stream/realrtsp/real.h:36:1: warning: "HEADER_SIZE" redefined
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30194 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 09:48:14 +00:00
12760fc513
Several hacks to fix compilation of tvi_dshow on MinGW64.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30169 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-02 17:41:11 +00:00
8fb7d45abd
Make code slightly more readable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30148 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 16:47:53 +00:00
b78313acd8
Fix crash if http reply contains neither "Accept-Ranges" nor "Server" fields.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30147 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 16:46:44 +00:00
c97d19eb49
Add a hack for broken youtube servers not returning Accept-Ranges.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30145 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 20:50:03 +00:00
efcc9ad712
Merge svn changes up to r30055
2009-12-18 18:54:42 +02:00
1598302be6
Fix printf format strings with invalid '%lf' conversion
...
Some code used an invalid '%lf' conversion specification for double
arguments. Maybe they were written that way due to confusion with
scanf where doubles are indicated by '%lf'; however it is not a valid
printf format specifier. Change those cases to use '%f'.
2009-12-15 15:27:30 +02:00
e58e467c56
100l, fix check for V4L2 capture capability flag.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29991 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-11 21:33:57 +00:00
ed333bb31d
Merge svn changes up to r29971
2009-11-29 06:11:02 +02:00
b3eaf99833
mime type [video/x-ms-wmv] is not an ASF redirector.
...
patch by KO Myung-Hun komh!chollian!net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29965 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-26 17:57:33 +00:00
34c8b502e9
stream_ffmpeg: Fix reads near EOF
...
stream_ffmpeg used libavformat's url_read_complete() to read data.
However that function returns failure if it did not manage to read the
_full_ amount of data asked for, while the behavior we want is to
return any positive amount of data there was before end of file. This
caused attempts to read the last bytes in a file to fail. Fix by using
url_read() instead of url_read_complete(); even if some reads before
EOF return less than the full amount that should not be a problem.
2009-11-23 03:47:34 +02:00
5995bc175a
Merge svn changes up to r29962
2009-11-23 01:56:21 +02:00
af2988cbce
Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many
...
name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-22 15:18:21 +00:00
e775bdd70d
10l to Reimar: Fix typo.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29931 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-18 09:13:09 +00:00
e02a2e7f08
Deobfuscate the special hack to disable cache for live555.
...
Cache can not be used for it, since it does not provide any
data stream, the data is provided to the demuxer "behind
MPlayer's back".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29930 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 19:23:55 +00:00
a81e043f98
Merge malloc+memset -> calloc
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29929 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 19:14:42 +00:00
450d40d443
Fall back to read-based seeking for ffmpeg:// URLs when is_streamed is set
...
(i.e. it is not possible to use url_fseek).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29928 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 18:30:33 +00:00
dc19e32d67
Enable the read-based forward seek fallback also when CONFIG_NETWORK is
...
enabled.
Enabling network support should not have side-effects on code not really
related to networking.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29926 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 18:08:18 +00:00
00ef6412f4
Use fill_buffer if available also for STREAMTYPE_STREAM
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29925 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 18:05:54 +00:00
5830140582
Add preliminary support for streaming via FFmpeg's URProtocol functions.
...
Basic playback tested for file and http protocols.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29923 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-17 16:09:17 +00:00
287b62163e
Merge svn changes up to r29912
2009-11-16 07:01:46 +02:00
7694e9074d
Move headers related to setting dvd speed to dvd_common.
...
This makes -dvd-speed work again.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29894 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 09:28:21 +00:00
2bf260398b
Set the EOF flag when dvdnav reached the end of the requested title.
...
Otherwise it would just hang, either at the menu or trying to play the
last played frame as a still frame.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29893 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-11 09:09:08 +00:00
0d40667c8c
Move dvd_speed and dvd_set_speed to dvd_common and implement -dvd-speed
...
support for dvdnav.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29890 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 23:20:05 +00:00
36ec821836
Move arrays used by both dvd and dvdnav to dvd_common.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29889 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 23:15:48 +00:00
Uoti Urpala