Uoti Urpala
2b47fd59ab
Merge svn changes up to r26540
...
Conflicts:
Makefile
2008-04-26 09:39:09 +03:00
Uoti Urpala
0e757bf9da
Remove _s/_st suffix from some struct names
...
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
2008-04-25 03:34:22 +03:00
diego
ab5d23b620
Merge stream/Makefile into top-level Makefile.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 13:38:12 +00:00
diego
a2073799ac
cosmetics: alphabetical order
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26513 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-24 10:12:02 +00:00
Uoti Urpala
c0c914effd
Move audio_id and video_id to options struct
2008-04-23 13:48:38 +03:00
Uoti Urpala
f518cf7ea9
Add option pointer to stream struct (at least temporarily)
...
The stream code does not access many option variables directly, but it
does access some such as audio_id and network_bandwidth (and does that
without including proper headers for them). Add option pointer to the
stream struct to allow access to those variables. Remove the unused
(always NULL) and clumsy-looking char** options parameter in the
open_stream call and replace it with the option pointer. The parameter
is currently only set in the main open_stream() call in MPlayer.c and
not in any other locations that can open a stream.
In the long term it might be better to pass a more limited set of
values somehow, but this should do for now.
2008-04-23 13:48:38 +03:00
Uoti Urpala
9e7dfe3fa3
Mark some functions static
...
These functions aren't used outside their file and have no prototype
in any header. Based on a forgotten patch from 2006 by Stefan Huehner,
(stefan huehner org).
2008-04-23 13:48:38 +03:00
nicodvb
65cfce72ec
in preparation for multi-frontend patch replaced file-static device names with sprintf() calls in 2 functions
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26433 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 10:23:54 +00:00
nicodvb
cc5373d7ca
removed useless parameter :type from -dvbin (the frontend type is reported by the card)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26423 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 20:36:57 +00:00
nicodvb
e23c244ee7
removed defunct options :vid and :aid from -dvbin (they were useless from the start)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26422 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 20:30:36 +00:00
albeu
f481e7870b
Remove the need for code using stream to export an mp_input_check_interrupt()
...
function. It also removes the compile-time dependency on input.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26358 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:36:28 +00:00
albeu
64868a36cd
Make stream independent of libmpdemux, the asf demuxer and streaming
...
code share a function and a few definitions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26357 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 00:32:35 +00:00
reimar
54c48f18a1
Fix possible integer overflow in malloc by using calloc instead.
...
Should fix CVE-2008-0073 as far as MPlayer is affected by this problem.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26299 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-29 11:35:29 +00:00
vayne
56b4f97277
mingw uses windows sockets.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26223 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-11 18:36:10 +00:00
diego
5444ec53dc
Add missing header #includes to fix 'make checkheaders'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26218 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-10 20:19:15 +00:00
diego
87281a7d6a
Add missing header #includes to fix 'make checkheaders'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26216 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-10 19:28:42 +00:00
diego
ed6d239e9d
Remove useless #include.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26215 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-10 19:28:18 +00:00
nicodvb
b867e95584
search channels.conf in mplayer's instdir if all other searches fail; patch by foxcore gmail com
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26155 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 22:28:07 +00:00
diego
23defac730
cache support for OS/2
...
patch by KO Myung-Hun, komh chollian net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26109 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-28 16:35:47 +00:00
diego
21c200e767
FFmpeg now uses different (unified) #include paths.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 15:46:36 +00:00
reimar
bafdcd542d
Avoid a pointless special-case for opening a file
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26083 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-24 11:21:27 +00:00
diego
8efb2fa21c
Add MPLAYER_ prefix to multiple inclusion guards.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
diego
c864f4de9e
Add multiple inclusion guard.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26045 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 00:18:25 +00:00
diego
878e9ef324
Add missing multiple inclusion guards.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26044 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-21 00:12:02 +00:00
diego
77eb726c3d
Remove pointless #ifdefs around extern declarations.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-20 08:51:53 +00:00
diego
b4558a3738
Add support for DOS-style file:///x:/path paths.
...
patch by KO Myung-Hun, komh chollian net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26037 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-20 08:20:49 +00:00
albeu
67352a6575
Fill stream->end_pos if possible, fixing lavf demuxers that need to seek.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26031 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-19 18:04:10 +00:00
reimar
24a3faf378
Support icyx://.
...
Patch by Sander Plas [sander oele net].
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26004 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 21:21:10 +00:00
reimar
4114557255
Always display Icy-Metadata if available, whether we recognize an ICY-Server
...
or not. I can not think of a reason why this should hurt.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26003 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 20:32:45 +00:00
reimar
367419a18b
Move printing of Icy-Metadata into an extra function
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26002 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 20:31:10 +00:00
reimar
48614bcc10
Remove useless code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26001 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 20:23:59 +00:00
reimar
de2ae95def
Detect IceCast also by Icy-MetaInt header part in http_streaming_start(),
...
as in fixup_open()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26000 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-15 20:20:16 +00:00
diego
835c654bb0
typo fix: inited --> initialized
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-14 14:23:55 +00:00
nicodvb
f785eba8a1
-chapter is now handled uniformly calling demuxer_seek_chapter() instead
...
of letting individual demuxers and stream readers do their nasty job
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25987 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 22:03:34 +00:00
diego
3cf3483e39
#include just libavutil/common.h, not all of libavutil/intreadwrite.h.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25980 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 09:05:31 +00:00
rtogni
9a1d198e9d
Stream IDs must be written as hex numbers. Fixes
...
http://wm.streampower.be/ceu/archive/CEU_COUNCIL_DELIBIRATIONS_PUBLIC_DEBATE/ceulive_1443.wmv
Patch by Peter Collingbourne pcc03 doc ic ac uk
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25928 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 23:50:08 +00:00
reimar
7fe6af8e10
vcd_read must read exactly VCD_SECTOR_DATA bytes.
...
If NetBSD can not handle this setting, the code must be rewritten to use a
temporary buffer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25901 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 12:18:05 +00:00
diego
fe9ec3ffdd
Consistently use uppercase filename as multiple inclusion guard.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25897 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 01:32:52 +00:00
ben
dce8f5aa20
factorize 2 tests
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25860 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 16:19:42 +00:00
ben
6230aab9bf
add a new state flag to dvdnav in order to notify if
...
something has changed in the current stream (being title, chapter,
audio layer or SPU one)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25858 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 16:17:44 +00:00
ben
923c1f08ca
remove useless casts
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25857 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 13:10:47 +00:00
ben
8a9021fc6d
simplify by a one-liner
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25856 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 13:07:47 +00:00
ben
ef8e584e39
remove the spu_set field, replaced by a flag
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25855 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 13:06:42 +00:00
ben
6ff2dd3561
this end brace was not correctly indented
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25854 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 12:54:44 +00:00
ben
8976b21cf1
automatically set spu button highlight when nav cell has changed
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25853 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 12:54:14 +00:00
ben
d56fe785be
Add support for dvdnav still frames playback.
...
Based on various patches from Otvos Attila
and MPlayer'ized by me.
N.B. Always use -vc ffmpeg12 with dvdnav://
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25852 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-26 11:51:34 +00:00
ben
43a7bc94c7
array was defined for 6 elements while 7 were declared
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25848 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-24 19:20:19 +00:00
ben
6274e7dee8
type expected by dvdnav_get_title_string() is const
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25847 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-24 19:18:15 +00:00
ben
19ee16f29f
remove some redundant declarations
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25846 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-24 19:15:28 +00:00
ben
e28bd7c6de
Add new command to switch between dvdnav titles
...
Based on parts of dvdnav monster patches from Otvos Attila
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25845 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-24 19:14:05 +00:00