57e0de3715
Merge svn changes r31198 - r31256
...
The cache changes in r31198 were somewhat broken; merge them together
with later fixes in one commit to keep all the "main branch side"
commits working.
2010-05-30 16:41:57 +03:00
0e0d88ede9
Merge svn changes up to r31256
2010-05-30 16:39:41 +03:00
c61e57bdd0
Skip svn changes up to r31248
...
Already done.
2010-05-30 16:30:54 +03:00
688c66a5d5
Merge svn changes up to r31244
2010-05-30 16:29:14 +03:00
7f1abf6cbf
Skip svn changes up to r31238
...
Already done.
2010-05-30 16:27:03 +03:00
8ce2c41ca5
Merge svn changes up to r31226
2010-05-30 16:25:04 +03:00
78f51a921f
Skip svn changes up to r31218
...
Already done here.
2010-05-30 16:19:38 +03:00
2f1a518d45
Merge svn changes up to r31211
...
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
2010-05-30 16:14:55 +03:00
9b68a49d01
Merge svn changes up to r31197
2010-05-30 15:58:55 +03:00
37a3e71558
Skip svn changes up to r31194
2010-05-30 15:56:36 +03:00
491ac8ef1a
documentation: remove svn-howto.txt, MAINTAINERS
...
svn-howto.txt doesn't apply to this tree, and MAINTAINERS had little
to do with reality even in svn.
2010-05-30 15:54:53 +03:00
adbb0477a0
Merge svn change r31191
2010-05-30 15:53:08 +03:00
ee129202ca
Skip svn r31190
...
The svn commit is another attempt at working around problems without
understanding them, and the problem in question should only happen in
svn.
2010-05-30 15:52:26 +03:00
e74361c488
Merge svn changes up to r31189
2010-05-30 15:51:33 +03:00
1ffe8bece5
Skip svn changes r31177, r31178
...
Internal FFmpeg build stuff.
2010-05-30 15:39:29 +03:00
a286506467
Merge svn changes up to r31176
2010-05-30 15:37:34 +03:00
36cce81353
Skip svn changes r31170, r31171
2010-05-30 15:32:11 +03:00
6f199ab3d9
Merge svn changes up to r31169
2010-05-30 15:27:58 +03:00
18657beb19
Merge svn changes up to r31145
2010-05-30 15:21:18 +03:00
1888e57af7
cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"
...
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.
Patch by Diego Biurrun.
2010-05-29 17:20:44 +03:00
a564c5a6cc
Fix typo in message.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31256 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 20:59:53 +00:00
6b255e5083
stream_check_interrupt should sleep even if no callback is set.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31255 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:49:02 +00:00
27d41fa5b3
100l, stream_check_for_interrupt argument is not in usec,
...
so we would end up sleeping for 10s instead of 10ms.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31254 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:47:03 +00:00
16e3978e1e
Document time scale for stream_check_interrupt argument.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31253 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:45:25 +00:00
d7f19144b1
Document that time argument is in milliseconds.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31252 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 18:44:41 +00:00
6f7c1ea409
Improve handling of cache process/thread hanging/being killed.
...
In particular allow a single STRG+C to quit MPlayer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31251 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 17:26:31 +00:00
4448190ef0
Fix cache process accidentally being killed by SIGUSR1.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31250 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 16:57:16 +00:00
95e8630981
Use MSGT_DECVIDEO in a video decoder.
...
Patch by Giorgio Vazzana, mywing81 gmail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31249 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 11:52:12 +00:00
f5f6bbaa09
Remove commented-out declaration of nonexisting function uGetTimer().
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31248 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 08:39:02 +00:00
c0262f7435
Drop pointless _t suffix from 'struct lavf_priv'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31247 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 00:25:28 +00:00
72ba1c8fec
Drop pointles _st suffix from struct mp_cmd_filter and mp_cmd_bind_section.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31246 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 23:36:03 +00:00
495115f2f1
cosmetics: vertical alignment in msg module help output.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31245 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 23:21:16 +00:00
3e830f876e
vf_yuy2 was removed after the 1.0rc3 branch was cut.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31244 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 22:43:49 +00:00
76c2abc99f
small cosmetics for the 1.0rc3 changelog
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31243 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 22:43:14 +00:00
ae85fe1d2f
Fix a bunch of typos in the stream cache code.
...
patch by Giorgio Vazzana, mywing81 gmail com
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31242 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 22:18:10 +00:00
5796e96b36
Drop pointless _s suffix from 'struct af_stream'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31238 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 20:59:40 +00:00
5e71e43bb5
Drop pointless _st suffix from 'struct stream'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31237 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 20:38:25 +00:00
069f0d026c
Drop pointless _s suffix from struct ao_data.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31235 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 18:15:04 +00:00
52b364075b
cosmetics: Reformat in K&R coding style.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31234 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 16:46:47 +00:00
16a226da45
Remove two pointless void* casts.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31233 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 16:13:53 +00:00
8350f5430a
Remove unnecessary demux_mkv_seek() forward declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31232 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 16:05:30 +00:00
b17704e6a8
cosmetics: Drop pointless _s suffix from 'struct ad_functions'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31231 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 10:10:27 +00:00
9bc124bcda
cosmetics: Drop pointless _s suffix from 'struct mp_image'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31230 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 10:08:30 +00:00
67958c9b9f
cosmetics: Drop _s suffix from 'struct vd_functions'.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31229 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:59:15 +00:00
4ab8fea71b
cosmetics: K&R coding style
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31228 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:54:37 +00:00
ca04a9c8ea
cosmetics: K&R coding style
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31227 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:54:11 +00:00
c36de0867f
Retry reading even if we hit eof before.
...
This allows playing growing files even with a large cache.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31226 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-26 18:23:43 +00:00
1e0b9a97fd
Switch ogg demuxing to lavf by default.
...
This has the side-effect of using fftheora by default instead of
theora, which possibly should be changed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31225 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-26 18:01:38 +00:00
328306708f
Re-enable wakeup-on-signal for cache process.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31224 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-26 17:56:11 +00:00
d304c1d56c
Disable waking the cache process up via a signal, it
...
currently causes read errors due to not handling EINTR.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31223 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-26 17:27:38 +00:00
Uoti Urpala
reimar
cehoyos
diego