Uoti Urpala
4cf9a52a64
Merge svn changes up to r31265
2010-06-02 17:46:33 +03:00
Uoti Urpala
2120eb5998
stream_radio.c: fix corrupt line from e3061749
2010-06-02 00:27:01 +03:00
Grigori Goronzy
b784346e78
libass: match font attachments based on extension
...
Instead of only relying on the MIME type, use the file extension as a
fallback for deciding which attachments are fonts and should be fed to
libass.
This also refactors the check into a separate function in mpcommon.
2010-06-01 23:15:41 +02:00
Uoti Urpala
2fcd4cf73e
demux_mkv: fix possible seek crash
...
Commit fc39d48465
("demux_mkv: store streams sequentially in
demuxer->[avs]_streams") had a copy-paste error causing it to look up
a video ID where it should have been an audio one. The most likely
visible symptom was a segfault when seeking while playing a
high-numbered audio track. Looks like I was careless with that
original commit, second bug in the same one...
2010-05-31 21:50:17 +03:00
Uoti Urpala
d75206ce68
demux_mkv: support VP8 video tag
2010-05-30 17:21:59 +03:00
Uoti Urpala
9a2224ac0f
demux_mkv: support WebM files
...
Accept files with doctype "webm" in addition to "matroska".
2010-05-30 17:15:22 +03:00
Uoti Urpala
407b17614a
ffmpeg_files/taglists.c: update to contain latest FFmpeg CODEC_ID values
2010-05-30 17:01:01 +03:00
Uoti Urpala
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
Uoti Urpala
0e0d88ede9
Merge svn changes up to r31256
2010-05-30 16:39:41 +03:00
Uoti Urpala
c61e57bdd0
Skip svn changes up to r31248
...
Already done.
2010-05-30 16:30:54 +03:00
Uoti Urpala
688c66a5d5
Merge svn changes up to r31244
2010-05-30 16:29:14 +03:00
Uoti Urpala
7f1abf6cbf
Skip svn changes up to r31238
...
Already done.
2010-05-30 16:27:03 +03:00
Uoti Urpala
8ce2c41ca5
Merge svn changes up to r31226
2010-05-30 16:25:04 +03:00
Uoti Urpala
78f51a921f
Skip svn changes up to r31218
...
Already done here.
2010-05-30 16:19:38 +03:00
Uoti Urpala
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
Uoti Urpala
9b68a49d01
Merge svn changes up to r31197
2010-05-30 15:58:55 +03:00
Uoti Urpala
37a3e71558
Skip svn changes up to r31194
2010-05-30 15:56:36 +03:00
Uoti Urpala
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
Uoti Urpala
adbb0477a0
Merge svn change r31191
2010-05-30 15:53:08 +03:00
Uoti Urpala
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
Uoti Urpala
e74361c488
Merge svn changes up to r31189
2010-05-30 15:51:33 +03:00
Uoti Urpala
1ffe8bece5
Skip svn changes r31177, r31178
...
Internal FFmpeg build stuff.
2010-05-30 15:39:29 +03:00
Uoti Urpala
a286506467
Merge svn changes up to r31176
2010-05-30 15:37:34 +03:00
Uoti Urpala
36cce81353
Skip svn changes r31170, r31171
2010-05-30 15:32:11 +03:00
Uoti Urpala
6f199ab3d9
Merge svn changes up to r31169
2010-05-30 15:27:58 +03:00
Uoti Urpala
18657beb19
Merge svn changes up to r31145
2010-05-30 15:21:18 +03:00
reimar
2bdc2412a1
Fix compilation if the compiler does not support -march=amdfam10
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31265 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 14:44:02 +00:00
Uoti Urpala
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
diego
47d1b72f46
cosmetics: Drop leading '_' from noinputmodules variable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31264 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:43:51 +00:00
diego
bce7550929
misc cosmetics: K&R style nits, #include placement, indentation
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31263 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:13:39 +00:00
diego
36edf0ef69
Mark key_type structure as const.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31262 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:11:55 +00:00
diego
1f14172166
getch2-os2.c: Add #include for the header that declares the public functions.
...
This should fix a bunch of warnings on OS/2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31261 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:10:30 +00:00
diego
e962e643be
cosmetics: Remove some commented-out #includes, fix a comment grammar error.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31260 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:07:10 +00:00
diego
6dda52e496
Directly mark jpeg_buf_src() as void instead of using some indirection marcro.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31259 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:06:29 +00:00
compn
52cc89f751
add "lpcJ" fourcc for the RealAudio 1.0 codec.
...
patch by Francesco Lavra
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31257 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 21:03:29 +00:00
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
cehoyos
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
diego
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
diego
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
diego
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
diego
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
diego
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
diego
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
diego
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