RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity
31,000 Commits 42 Branches 86 Tags 168 MiB
173beb5608
Commit Graph

943 Commits

Author SHA1 Message Date
Uoti Urpala
bc0f524909 Merge svn changes up to r30502 
Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb.h
	libswscale/swscale.c
	libvo/x11_common.c
 2010-03-09 19:44:28 +02:00
Uoti Urpala
12d3caebc7 Merge svn changes up to r30475 2010-03-09 19:18:43 +02:00
Uoti Urpala
b34a88e4f4 translations: tweak cases that relied on concatenating adjacent strings 
Tweak some code parts that used to rely on string literals from
translation macros being concatenated with other adjacent string
literals. Break up the resulting string into independently translated
parts, so that the existing translations for those parts can still be
used.
 2010-03-07 21:35:23 +02:00
Uoti Urpala
5234c72e28 Restore collapsed whitespace in output messages 
For some reason commit e306174952, which
replaced translation macro names with the corresponding English
strings, also collapsed multiple consecutive space characters into
one. Change most of these back. In a couple of cases the amount of
whitespace is important for alignment, and for the rest it at least
keeps the strings closer to the existing translations.
 2010-03-07 21:34:54 +02:00
reimar
9d9b7a1e22 Reindent 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30499 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-03 22:33:35 +00:00
reimar
8613396aa0 Add support for FFmpeg's rtsp dummy URL-with-pseudo-demuxer scheme. 
ffmpeg://rtsp://... will play a rtsp stream via FFmpeg.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30498 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-03 22:32:48 +00:00
reimar
d97ee3033d Fix argument order for lseek, fixes cookie loading in Windows and in general 
everywhere where SEEK_SET != 0.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30496 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-03 17:50:18 +00:00
diego
59e26907b6 Add license header to all files missing it in the stream subdirectory. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30468 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-30 22:26:47 +00:00
diego
12abc254d5 stream/rtp.h appears not to originate from dvbstream. 
In any case it is completely trivial and non-copyrightable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30465 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-30 21:38:05 +00:00
Uoti Urpala
e28e4a1b15 Merge svn changes up to r30419 2010-01-25 15:59:53 +02:00
Uoti Urpala
4ebf007580 Merge svn changes up to r30375 2010-01-25 15:36:38 +02:00
Uoti Urpala
69fe2522f8 Merge svn changes up to r30301 2010-01-25 15:07:30 +02:00
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
Uoti Urpala
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
reimar
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
reimar
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
reimar
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
Uoti Urpala
819b8f08a2 Merge svn changes up to r30236 2010-01-08 02:44:37 +02:00
Uoti Urpala
852570d342 Merge svn changes up to r30216 2010-01-08 02:39:39 +02:00
Uoti Urpala
17eb7f2c4b Merge svn changes up to r30195 2010-01-08 02:06:42 +02:00
Uoti Urpala
d157b2a8ce Merge svn changes up to r30173 2010-01-08 01:17:56 +02:00
Uoti Urpala
231b33a02f Merge svn changes up to r30165 2010-01-08 01:05:30 +02:00
reimar
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
reimar
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
diego
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
diego
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
reimar
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
reimar
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
reimar
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
reimar
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
Uoti Urpala
efcc9ad712 Merge svn changes up to r30055 2009-12-18 18:54:42 +02:00
Uoti Urpala
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
reimar
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
Uoti Urpala
ed333bb31d Merge svn changes up to r29971 2009-11-29 06:11:02 +02:00
compn
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
Uoti Urpala
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
Uoti Urpala
5995bc175a Merge svn changes up to r29962 2009-11-23 01:56:21 +02:00
reimar
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
cehoyos
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