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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
Uoti Urpala
287b62163e
Merge svn changes up to r29912
2009-11-16 07:01:46 +02:00
reimar
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
reimar
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
reimar
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
reimar
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
reimar
80217b4240
Remove unused extern declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29888 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 23:12:01 +00:00
reimar
8f164e07a0
Share dvd_device extern declaration between dvd and dvdnav.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29887 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 23:10:57 +00:00
reimar
6e8f1e844f
Remove an unused variable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29886 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 23:03:52 +00:00
reimar
bd82936f63
Set demuxer->teletext to NULL when closing the TV interface,
...
since analog teletext can not (yet) work without the TV interface.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29873 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-10 11:24:29 +00:00
reimar
87a4e870b7
The code for the non-networking case is the same whether networking
...
support was enabled or no, so avoid duplicating it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29861 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 14:12:14 +00:00
reimar
0d782226c1
Factor out triplicated break statement.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29860 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 14:08:35 +00:00
reimar
a144a22453
Remove unused mp_dvdnav_aid_from_audio_num function
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29859 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 10:29:15 +00:00
reimar
2dfd5e5f53
Fixup the dvdnav <-> sid mapping, dvdnav_spu_stream_to_lang and
...
dvdnav_get_spu_logical_stream both take the same numbering (i.e.
not the ids used in the MPEG-TS).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29858 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-09 10:27:48 +00:00
cehoyos
2a5611473c
Remove CONFIG_TV_TELETEXT.
...
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 16:40:42 +00:00
cehoyos
423c415534
Separate teletext from tv support.
...
Path by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-07 12:31:05 +00:00
reimar
ef479d9d01
dvdnav: print ID_SID_..._LANG, just like dvd://
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29832 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:29:14 +00:00
reimar
c76ea256de
Cosmetics: indentation, merge two consecutive ifs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29831 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:27:25 +00:00
reimar
503fe2eb9c
Make dvdnav also print info about audio streams with unknown language, just like dvd://
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29830 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:26:23 +00:00
reimar
b00d649d98
Make the dvdnav stream language information output more similar to the dvd one.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29829 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:22:38 +00:00
reimar
f46ede9a6b
Change the subtitle numbers in the dvdnav subtitle language info to match
...
the numbers used by MPlayer's OSD and -sid option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29828 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-11-05 21:13:38 +00:00
cehoyos
631d5f1f84
Replace two more occurences of tvi_vbi with dec_teletext.
...
Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29808 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-31 15:30:56 +00:00
cehoyos
88397d63f1
Support ISDB-Tb tunning in Brazil
...
Patch by Sérgio Fortier, sergiofortier A yahoo com br
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29803 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-30 10:03:54 +00:00
cehoyos
9df11ee8bf
Add MSGT_TELETEXT, rename TVI_CONTROL as VBI_CONTROL and fix some paths
...
in comments.
Based on a patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29802 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-29 22:39:00 +00:00
cehoyos
a9474b0b39
Move teletext specific code from stream into libmpcodecs.
...
Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-29 22:13:04 +00:00
cehoyos
1198f65d0b
Fix teletext character set auto-detection.
...
Patch by Francesco Lavra, francescolavra interfree it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29796 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-24 13:19:20 +00:00
diego
50f563f927
cosmetics: Remove some pointless parentheses from return calls.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-10-08 11:25:01 +00:00
Uoti Urpala
0e1b7765be
Merge svn changes up to r29644
2009-09-04 19:49:35 +03:00
reimar
d1e7b4dc6f
Fix possible crashes with invalid SDPs that result in stream descriptions
...
not being initialized.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29626 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:55:36 +00:00
reimar
ac11b35a6a
Fix several more rtsp-related memleaks.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29625 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:44:26 +00:00
reimar
70a247b26d
Fix asmrp_dispose to also free the buffer.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29624 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:37:32 +00:00
reimar
2726fe03ec
Use calloc to ensure rmff_new_mdpr returns fully initialized data.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29623 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:35:06 +00:00
reimar
3351bc2d18
Move variable declaration to where it is used.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29622 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:28:08 +00:00
reimar
079a64ae8d
Make sure we do not strdup(NULL), avoids a crash with non-real streams.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29621 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:22:08 +00:00
reimar
5c4a06530d
Fix several memleaks in real_setup_and_get_header
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29620 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:20:45 +00:00
reimar
24e788fc4c
Change real_setup_and_get_header to use goto a single exit path to simplify
...
proper freeing of allocated data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29619 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 10:10:42 +00:00
Uoti Urpala
95da34aa07
Merge svn changes up to r29532
2009-08-18 02:29:37 +03:00
cehoyos
6a101a97f9
Fix file information. Patch by Francesco Lavra, francescolavra interfree it
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29521 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-15 23:41:35 +00:00
cehoyos
4112165879
Add missing major contributors to copyright statement.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29520 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-15 23:33:56 +00:00
cehoyos
19199c79ae
Fix another typo. Patch by Francesco Lavra, francescolavra interfree it
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29470 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 15:39:08 +00:00
cehoyos
c8bbeea3b2
Add standard GPL license header. Patch by Francesco Lavra, francescolavra interfree it
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29468 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 14:50:24 +00:00
cehoyos
35b86231c2
Fix more typos. Patch by Francesco Lavra, francescolavra interfree it
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29467 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 14:44:12 +00:00
cehoyos
463ac707c1
Remove unused include's. Patch by Francesco Lavra, francescolavra interfree it
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29466 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 14:41:15 +00:00
cehoyos
7fd95348fe
Fix typos. Patch by Francesco Lavra, francescolavra interfree it
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29465 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 14:38:18 +00:00
Uoti Urpala
4a36b51ea6
Merge svn changes up to r29455
2009-07-29 01:32:03 +03:00
uau
45b7b9374b
stream/realrtsp/real.c: Fix another integer overflow
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29455 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-28 16:25:03 +00:00
uau
4dc235eb7c
stream/realrtsp/real.c: Fix integer overflow
...
Pointed-out-by: tixxDZ <tixxdz at gmail dot com> - DZCORE Labs, Algeria
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29447 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-27 16:53:48 +00:00
diego
e5751ced4f
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 19:53:00 +00:00
Uoti Urpala
d6c410b54c
Replace libavutil internal header #includes with MPlayer copies
...
Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h
and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/
instead.
2009-07-26 06:16:43 +03:00
Anton Khirnov
87366694d8
Remove the internal GUI
...
The GUI is badly designed and too closely coupled to the internal
details of other code. The GUI code is in bad shape and unmaintained
for years. There is no indication that anyone would maintain it in the
future either. Even if someone did volunteer to implement a better
integrated GUI having the current code in the tree probably wouldn't
help much. So get rid of it.
2009-07-07 21:49:42 +03: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
Amar Takhar
e306174952
Translation system changes part 2: replace macros by strings
...
Replace all MSGTR_ macros in the source by the corresponding English
string.
2009-07-07 01:38:20 +03:00
Amar Takhar
b5972d6f14
Translation system changes part 1: wrap translated strings
...
Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.
2009-07-07 01:28:07 +03:00
reimar
437efdc855
Replace incorrect use of strncpy by av_strlcpy.
...
Only a real issue if inet_ntoa can actually return a string of more than 255 bytes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29393 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 13:54:22 +00:00
diego
bf67bb10a1
Files should be opened in binary mode on OS/2.
...
patch by KO Myung-Hun, komh chollian net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29346 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-03 14:06:10 +00:00
reimar
c783e58e91
Using nl_langinfo in the asf mmst implementation makes no sense since
...
MPlayer does not use setlocale.
Just default to UTF-8 as input charset until there is a better solution.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29333 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-31 13:09:48 +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
Uoti Urpala
1db1773ec2
Merge svn changes up to r29277
2009-05-08 23:50:26 +03:00
diego
4567425051
Reemit the ID_AID_x_LANG for the track. This allows the identification of the
...
audio track by language code (en or es) rather than by ID (128 or 129).
patch by Kevin DeKorte, kdekorte gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29170 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-11 13:51:02 +00:00
reimar
b6225fc8ae
Make tvi_v4l2 print -1 as "Current input" if the ioctl to read it failed.
...
Previously it printed (number of inputs + 1) which is needlessly confusing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29161 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-10 10:13:41 +00:00
reimar
486ce51625
Add a -indentify message that indicates if the current DVDNAV title is
...
a menu or a video.
Patch by Kevin DeKorte [kdekorte gmail com], approved by Nico.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29156 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-09 14:23:09 +00:00
Uoti Urpala
d136cf6882
Merge svn changes up to r29134
2009-04-02 23:55:13 +03:00
diego
a38ca08ca0
Remove unused variable along with the related warning.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29122 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-01 16:27:03 +00:00
Uoti Urpala
cf9edda1d3
Merge svn changes up to r29117
2009-04-01 02:43:47 +03:00
reimar
f5d01796a8
100l, revert r29082, I missed that the vts comparison should be case-insensitive.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29084 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 16:09:56 +00:00
reimar
8d376de96f
Reindent
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29083 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 15:54:08 +00:00
reimar
df1af70475
Simplify extracting title number from ifo name
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29082 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-28 15:53:32 +00:00
reimar
8198495234
Simplify detection of .ifo extension.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29078 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-27 21:26:26 +00:00
compn
09d4f18010
change close to closesocket, unifies close streaming code
...
patch by Francesco Cosoleto , cosoleto gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29066 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-26 13:35:12 +00:00
reimar
127480e660
Add support for mmsh:// as alias for mmshttp://
...
Patch by Francesco Cosoleto [cosoleto gmail com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29064 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-26 11:00:04 +00:00
reimar
b397b28b31
Add TVI_CONTROL_VID_SET_WIDTH_HEIGHT to set width and height together for v4l2,
...
otherwise some drivers will always stay stuck in the lowest resolution.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28975 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-16 17:12:29 +00:00
reimar
37c6f0d36c
100l fix calculation of dropped frames, number of frames is time * fps, not time / fps.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28962 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 16:12:05 +00:00
Uoti Urpala
ae2faad666
Merge svn changes up to r28951
2009-03-14 23:52:45 +02:00
ben
540847db7b
Ensure the string we're trying to compare is actually not NULL.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28920 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 20:31:03 +00:00
ben
571c0fb8a9
The first valid index is total count - 1 (usually 0)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28919 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 20:30:24 +00:00
Uoti Urpala
0c6f667896
Merge svn changes up to r28755
2009-02-28 05:58:59 +02:00
reimar
8605d7090e
Use memset to make sure all parts of struct sockaddr_in are always initialized.
...
Problem reported by [kmkaplan+mplayer-dev-eng (at) kim kim-minh com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28732 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-25 12:51:20 +00:00
Uoti Urpala
66f6f9f076
Merge svn changes up to r28712
2009-02-23 21:00:52 +02:00
diego
ee50536b74
Accept DVB API 5, patch by Steven Brudenell, steven.brudenell gmail com.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28702 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-22 14:12:33 +00:00
Uoti Urpala
186e5a998c
Merge svn changes up to r28641
...
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
diego
1b915e419e
Replace double semicolon by single semicolon.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +00:00
Uoti Urpala
9790f4e6e7
Merge svn changes up to r28461
2009-02-04 00:28:17 +02:00
diego
7e1662839a
Restructure network tests: Always check for both inet_aton and inet_pton.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28439 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 14:38:28 +00:00
diego
0f65d3be9d
Convert HAVE_WINSOCK2_H into a 0/1 definition.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28437 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:42:27 +00:00
diego
3b222d68b0
HAVE_ATON --> HAVE_INET_ATON to match FFmpeg and give it a 0/1 value.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28435 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:33:35 +00:00
diego
be5f5c7046
Convert HAVE_CLOSESOCKET and HAVE_SOCKLEN_T into 0/1 definitions.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28434 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:16:46 +00:00
Uoti Urpala
dd888b05ff
Merge svn changes up to r28366
...
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
2009-01-26 00:58:15 +02:00
reimar
84fbeecf72
Fix a NULL-check that used && instead of || and thus could not avoid crashes.
...
Patch by Luis Felipe Strano Moraes (luis strano gmail com).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28354 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-25 18:23:05 +00:00
Uoti Urpala
9bcd12fdf5
Merge svn changes up to r28310
...
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
reimar
4af9bf7e02
Switch internal dvdread to libdvdread SVN external.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28280 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-08 19:28:28 +00:00
diego
824abb5a65
Add missing 'void' keyword to parameterless function declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 14:48:03 +00:00
reimar
82d097d04b
Fix DVD seek_to_chapter: the title number must be converted to a per-VTS
...
title number first. Also add a few out-of-bounds checks just in case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28226 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 11:46:34 +00:00
reimar
a2c2268cdf
Work around a dvdread bug where DVDReadBlocks would return values < 0 on read error,
...
causing hangs e.g. when seeking to the very last chapter (which would read beyond the
size of the DVD).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28216 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-31 14:21:50 +00:00
Uoti Urpala
c1b80dcbbb
Merge svn changes up to r28204
2008-12-27 17:40:57 +02:00
diego
47044eb841
Avoid u_ BSD type names.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-27 12:03:51 +00:00
Uoti Urpala
a3ab9e8e46
Merge svn changes up to r28149
2008-12-14 17:28:16 +02:00
diego
39090878e5
Replace informal GPL notes by standard GPL header.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28140 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-13 12:13:48 +00:00
Uoti Urpala
8c144171bb
Merge svn changes up to r28087
...
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
2008-12-04 01:55:52 +02:00
diego
0864f92e7a
Get rid of pointless 'extern' keywords.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
Uoti Urpala
e62517ef6a
Merge svn changes up to r28065
2008-12-02 18:02:05 +02:00
reimar
bd7e915bf5
Move PTHREAD_CACHE define logic to configure.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28048 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-28 17:04:36 +00:00
Uoti Urpala
1715c2a336
Merge svn changes up to r27949
...
Conflicts:
common.mak
libvo/vo_xv.c
libvo/x11_common.c
libvo/x11_common.h
stream/cache2.c
2008-11-17 20:50:23 +02:00
reimar
7ecf9a6d04
100l, stream->cache_pid can not be used directly in pthread_create,
...
it has the wrong type. Luckily we currently do not need the value anyway.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27930 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:43:39 +00:00
reimar
ca77ee41f0
Use pthreads for the cache on Cygwin, since _beginthread is not available
...
and the previous CreateThread method would probably leak memory here, too.
Also pthreads seems to be the official Cygwin threading API.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27928 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:08:50 +00:00
reimar
1f52c9ed8b
Include cache2.h in cache2.c, fixes an implicit declaration warning for cache_do_control
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27910 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-14 19:29:04 +00:00
Uoti Urpala
e46ce9c0ac
Merge svn changes up to r27899
2008-11-06 20:41:40 +02:00
nicodvb
e3d5eacec3
set to -1 fds that were closed; handle the sec_fd only if CONFIG_DVB_HEAD isn't defined; patch by Reimar
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27897 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-05 23:37:52 +00:00
reimar
1efaaef8a6
Intialize unused fd variables to -1 (which is actually invalid) instead
...
of 0 (which is stdin and can cause weird side-effects).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27893 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-04 18:44:14 +00:00
reimar
2808f340cd
Fix condition broken in r27401 which incorrectly caused stdin to be closed after playing DVB.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27892 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-04 18:42:46 +00:00
reimar
a2cd1d4d04
Forgotten reindent
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27882 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 17:15:44 +00:00
reimar
863a334a9f
Add a noicyx:// protocol to allow easier testing for misconfigured servers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27881 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 17:15:14 +00:00
reimar
6818a5e843
vfw.h needs a windows.h include before on MinGW64.
...
Since vfw.h on MinGW32 includes windows.h automatically it should not make a difference there.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27880 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 16:46:02 +00:00
reimar
d4020af479
Avoid a memleak if allocation of field_name fails, fixes bug #1319 .
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27868 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-31 12:56:25 +00: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
diego
c0f231ac47
Conditionally declare a conditionally used variable, fixes the warning:
...
stream/dvb_tune.c:99: warning: unused variable 'sec_dev'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27820 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-24 09:13:04 +00:00
diego
ed0af8844a
Determine default CD/DVD device in configure instead of using an #ifdef jungle.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27809 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-21 07:02:25 +00:00
diego
6f6bf7f765
Replace typeof by __typeof__, the former is a non-portable GNU extension.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27807 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-20 09:55:38 +00:00
reimar
3d1f36e3e7
Avoid CreateThread and especially TerminateThread since they cause a memleak.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27804 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 18:05:45 +00:00
reimar
834d4c5b7b
Remove useless casts.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27803 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-19 17:28:23 +00:00
diego
2195547220
Revert declaring ThreadProc as void, it breaks the WINAPI.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27790 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 19:24:21 +00:00
diego
629db77d89
Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs.
...
config.h should only contain option definitions, no logic.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27787 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:28:38 +00:00
diego
17f509905c
Rename stream/netstream.h to stream/stream_netstream.h; netstream.h to make it
...
clearer that netstream.h belongs to stream_netstream.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27779 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 17:01:40 +00:00
diego
4d644f513c
Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.
...
This avoids a pointless indirection that only obscures what is really done.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 16:23:55 +00:00
diego
9214b77133
Declare ThreadProc as void, it does not return anything, fixes the warning:
...
stream/cache2.c:364: warning: control reaches end of non-void function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27759 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 15:51:29 +00:00
diego
bc7cf2efd8
Remove unused function, fixes the warning:
...
stream/tvi_dshow.c:1311: warning: 'reconnect_pins' defined but not used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27758 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 15:25:34 +00:00
diego
c8808af5a0
Unconditionally #include osdep/shem.h, fixes the warnings on Cygwin:
...
stream/cache2.c:244: warning: implicit declaration of function `shmem_alloc'
stream/cache2.c:265: warning: implicit declaration of function `shmem_free'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27757 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 15:13:40 +00:00
diego
ac3b6d090c
Move socklen_t typedef from config.h to stream/network.h.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27744 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-12 12:12:41 +00:00
Uoti Urpala
ebb4abf208
Merge svn changes up to r27682
...
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
2008-10-02 05:17:23 +03:00
voroshil
8095d9dacf
Add debug message about loaded frequency tables.
...
Replace printed code of input type with user-frendly "broadcast"/"cable" strings.
patch from Laurent laurent dot aml at gmail dot com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27662 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-24 20:49:27 +00:00
voroshil
7132e7d852
Make output messages of frequency selection code more useful by
...
providing additional information like requested frequency
and found nearest fequency/channel.
patch from Laurent laurent dot aml at gmail dot com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27661 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-24 20:42:15 +00:00
voroshil
89600cd4ca
Fix overflow in frequency conversion code inside tvi_dshow.
...
patch from Laurent laurent dot aml at gmail dot com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27660 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-24 20:30:06 +00:00
Uoti Urpala
849dc0ba31
Merge svn changes up to r27649
...
Conflicts:
Makefile
configure
libvo/x11_common.c
2008-09-20 16:13:33 +03:00
diego
261e389fdd
With -identify, ID_DVD_VOLUME_ID is not shown on some systems.
...
Using DVDISOVolumeInfo instead of DVDUDFVolumeInfo fixes this.
patch by Mathieu SCHROETER, mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27631 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-16 21:30:04 +00:00
Uoti Urpala
b56858342f
Merge svn changes up to r27514
2008-09-03 10:16:30 +03:00
diego
788a4d5f91
Move '#define closesocket close' preprocessor directive to a common place
...
and put it under the proper '#ifndef HAVE_CLOSESOCKET' condition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27505 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-01 07:31:57 +00:00
diego
f27f04a53d
Revert moving closesocket definition and network headers to network.h.
...
This caused lots of trouble on MinGW, we need a different solution.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27504 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-31 13:59:54 +00:00
rathann
97e5f304ce
Rename internal libdvdread fork from dvdread to libdvdread
...
to avoid clashing with external libdvdread.
(Sync with libdvdread r1122)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 12:22:21 +00:00
reimar
fd75ca0c6a
Print DVD volume ID with -identify.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27497 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 11:21:11 +00:00
diego
c152b07e66
Move duplicated '#define closesocket close' into network.h along with
...
network-related #include #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27496 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 22:55:39 +00:00
diego
2a90e559a9
consistency cosmetics: Avoid using .. in #include paths.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27495 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 22:29:27 +00:00
diego
3af860b877
Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H.
...
This is what it is called in FFmpeg and more consistent with other
names for similar conditionals. This fixes a potential compilation
failure on MinGW, as described in Bugzilla #1262 .
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27493 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 20:05:08 +00:00
diego
511729a3a2
Use '#include <poll.h>' instead of '#include <sys/poll.h>'.
...
It is the standard location as defined by the Open Group.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27463 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 15:54:53 +00:00
Uoti Urpala
f6dfaf26f8
Make various functions static
2008-08-12 14:57:12 +03:00
Uoti Urpala
cab2e4f5ca
Include corresponding .h in some .c files
2008-08-12 13:46:01 +03:00
Uoti Urpala
0d09176078
stream.h: Add 2 prototypes instead of declaring them in cache2.c
...
Declare stream_fill_buffer() and stream_seek_long() always (before
they were only declared if cache was disabled and those were used
instead of cached versions). Remove the now redundant declarations in
cache2.c.
2008-08-12 12:49:37 +03:00
Uoti Urpala
17d3e4b36d
Merge svn changes up to r27441
...
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
2008-08-08 02:13:09 +03:00
diego
e0b1c9a6b7
Give a CONFIG_ prefix to preprocessor directives that lacked one and
...
change arbitrary prefixes to CONFIG_.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
diego
091d352d06
Rename font-related preprocessor directives.
...
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:36:07 +00:00
diego
141e81cce4
Rename a bunch of miscellaneous preprocessor directives.
...
Switch them from a HAVE_ to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 08:58:07 +00:00
diego
024b6efdf1
Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x.
...
Use it in all the places that checked for either ALSA 0.9 or 1.x.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27422 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 23:19:29 +00:00
diego
f83e779ee4
Rename some audio-output-related preprocessor directives.
...
Switch them from a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27419 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-05 16:32:47 +00:00
diego
02135001b4
Change a bunch of video/audio-output-specific preprocessor directives from
...
a HAVE_ prefix to a CONFIG_ prefix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 15:21:40 +00:00
Uoti Urpala
6cce822505
Merge svn changes up to r27399
...
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
2008-08-02 22:04:35 +03:00
diego
d17f9943af
Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
...
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-01 20:28:58 +00:00
diego
3b31fa5717
Rename two GUI-related preprocessor directives:
...
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 13:44:59 +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
reimar
fb2b4dea1c
Do not include sys/socket.h when using winsock2, it is pointless
...
and breaks compilation under MinGW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27352 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-26 20:58:50 +00:00
Uoti Urpala
2d4656e070
Merge svn changes up to r27332
2008-07-21 15:03:49 +03:00
reimar
6dfb85dc9e
Our ALSA code needs alloca, so check for it in configure and include alloca.h
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27313 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-17 17:11:30 +00:00
reimar
803385a5d7
Replace S_IREAD|S_IWRITE by POSIX-compatible S_IRUSR|S_IWUSR (not exactly the same, but should not matter).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27289 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-15 17:35:52 +00:00
michael
0589f47239
Remove -std=gnu99/gnu89/default dialect linux define, as it violates the
...
C standard.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27282 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-15 00:21:32 +00:00
Uoti Urpala
92f0cba26b
Merge svn changes up to r27281
2008-07-15 02:59:27 +03:00
nicodvb
b16d3fd6c2
in dvd streams the title part ranges from 1 to 99
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27267 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-12 08:07:54 +00:00
Uoti Urpala
ca3feba5c3
Merge svn changes up to r27242
...
Conflicts:
Makefile
configure
2008-07-09 18:32:51 +03:00
diego
3a0ee8a23a
Add missing #include <sys/socket.h>, fixes the warnings:
...
stream/librtsp/rtsp.c: In function 'write_stream':
stream/librtsp/rtsp.c:68: warning: implicit declaration of function 'send'
stream/librtsp/rtsp.c: In function 'read_stream':
stream/librtsp/rtsp.c:95: warning: implicit declaration of function 'recv'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27234 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-08 08:20:39 +00:00
nicodvb
efb1379f72
avoid unnecessary strdup(); patch by Aurel
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27226 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 18:04:14 +00:00
diego
0b2ed65981
Surround stream cache specific code by an appropriate #ifdef; fixes linking
...
when stream cache is disabled.
noticed by Andrea Palmatè, andrea amigasoft net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27210 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 14:22:57 +00:00
diego
462fa761e5
Add some more -identify information for CDDB.
...
patch by Mathieu Schroeter, mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27207 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 11:44:13 +00:00
diego
dfa733c50b
Add disc ID to -identify output.
...
patch by Mathieu Schroeter, mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27206 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-05 11:39:43 +00:00
Uoti Urpala
8ea134bd23
Merge svn changes up to r27202
2008-07-05 02:55:56 +03:00
diego
f3bf43f443
Rename stream_livedotcom.c to stream_live555.c, the name is used everywhere.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27199 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 20:14:00 +00:00
nicodvb
a4b4b991dc
cosmetics: in ifo_stream_oped() aligned the prototype to the style
...
of the rest of the file and renamed dvd_priv to spriv
(it's a stream_priv_s*, while dvd_priv is used for other
purposes in the rest of the file)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27198 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:03:57 +00:00
nicodvb
8742c266db
in ifo_stream_open() propagate the device based on the dirname of stream->url; patch by Mathieu SCHROETER mathieu.schroeter gamesover ch
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:00:07 +00:00
nicodvb
7043b6d0d1
dvd_device must be handled exclusively by the option parser; it can't be changed at will in ifo_stream_open()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27196 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:57:33 +00:00
nicodvb
93b837f0a7
added support for the device part in the url; patch by
...
Mathieu SCHROETER mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27195 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:54:45 +00:00
Uoti Urpala
7de350c673
Merge svn changes up to r27184
2008-07-01 16:18:21 +03:00
voroshil
6077530ac2
Try to get frame rate information through VIDIOC_G_PARM if
...
capture device driver (such as uvcvideo USB video driver) does
not provide VIDIOC_G_STD ioctl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27171 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-30 17:46:27 +00:00
voroshil
fddbd84992
Fix division by zero in tvi_v4l2 which occures when capture device
...
driver (such as uvcvideo USB video driver) does not provide VIDIOC_G_STD ioctl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27170 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-30 17:42:35 +00:00
nicodvb
ec8c4471ef
removed struct dvdnav_event_t that is 1) unused; 2) has an improper name. You can't turn your back for a second...
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27157 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 13:14:02 +00:00
vayne
08c1e65e27
mingw uses Windows sockets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27141 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-28 19:32:35 +00:00
lu_zero
4989f301f1
Fix the issue instead of reverting
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27136 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-25 13:03:18 +00:00
lu_zero
401c4717b9
Move rtsp_close away by simplification - avoids symbol clash with libnemesi
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27135 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-25 09:53:45 +00:00
Uoti Urpala
de560e8167
Merge svn changes up to r27123
...
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
2008-06-23 03:58:44 +03:00
diego
864dc16140
Reorder some functions to avoid implicit declaration warnings.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27099 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-19 07:13:50 +00:00
Uoti Urpala
68e70b3ec3
Merge svn changes up to r27092
...
Conflicts:
libmpdemux/demuxer.c
libvo/vo_xv.c
mencoder.c
2008-06-17 05:04:32 +03:00
diego
8f044ad84b
Add missing #includes to fix 'make checkheaders'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27075 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-16 08:40:01 +00:00
voroshil
5fc5e26c3b
Ability for specifying TV standard individually for each TV channel.
...
Slightly modified patch by Ildar devel at pop3 dot ru
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27057 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-14 09:14:16 +00:00
Uoti Urpala
af3fcdf2de
Merge svn changes up to r27025
...
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
2008-06-07 19:57:57 +03:00
ben
883dfcb409
Factorizes dvdnav aid retrieval code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27022 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:13:15 +00:00
ben
9b52abcb8b
Add routine that provides audio ID corresponding to logical number
...
in dvdnav stream.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27021 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:06:27 +00:00
ben
c71d348a7d
Rename some functions as they are mplayer related and not
...
from libdvdnav public API.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27018 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:57:23 +00:00
ben
51880f9029
rename for consistency
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27017 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:42:40 +00:00
ben
c655b2d499
Add routine to determine if SPU has changed in dvdnav stream.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27016 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:42:00 +00:00
ben
a5d9a2b2b0
Add routine to determine if audio has changed in dvdnav stream.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27015 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:37:32 +00:00
ben
d0bfe9916c
Save DVDNAV palette info.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27005 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 10:30:49 +00:00
Uoti Urpala
d5c868325c
Merge svn changes up to r26979
...
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
2008-06-04 08:10:48 +03:00
reimar
9c6a2cb740
100l, fix wrong order of cases in cache_do_control
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26956 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-01 18:14:56 +00:00
rtogni
44111a3753
Fix compilation with internal dvdnav
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26939 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-31 13:42:09 +00:00
nicodvb
c2ed18b40b
adapted to the dvdread->libdvdread transition in dvdnav's repository
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26938 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-31 12:52:55 +00:00
reimar
09b97f4826
Handle NULL control function in cache_execute_control, fixes crash with http urls.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26929 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-30 15:20:42 +00:00
reimar
8e218ff329
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26879 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-26 18:46:13 +00:00
reimar
5560a0b358
Add basic support for stream controls with cache enabled.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26865 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 07:48:35 +00:00
diego
c657594049
cosmetics: Remove useless parentheses from return statements.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 08:43:15 +00:00
Uoti Urpala
a41db36b22
Merge svn changes up to r26783
...
Conflicts:
Makefile
common.mak
configure
libmpcodecs/vd_ffmpeg.c
libmpdemux/demux_mkv.c
libvo/vo_xv.c
mplayer.c
2008-05-15 21:19:35 +03:00
diego
84fa3d69f3
Add missing stream.h #include, fixes the warning:
...
stream/tcp.c:197: warning: implicit declaration of function 'stream_check_interrupt'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26783 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-15 16:11:50 +00:00
diego
0ecfcdce00
Use standard license headers with standard formatting.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26769 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 17:20:42 +00:00