Uoti Urpala
b996250a2a
Merge svn changes up to r30879
2010-03-10 03:20:23 +02:00
Uoti Urpala
f5115f249c
Ignore svn change r30877
2010-03-10 03:19:02 +02:00
Uoti Urpala
0269d22d32
Merge svn changes up to r30876
2010-03-10 03:18:42 +02:00
Uoti Urpala
240550bbb9
Merge svn changes up to r30848
2010-03-10 03:00:14 +02:00
Uoti Urpala
9895f2360f
Ignore svn changes up to r30817
2010-03-10 02:37:11 +02:00
Uoti Urpala
4857965118
Merge svn changes up to r30815
2010-03-10 02:36:35 +02:00
Uoti Urpala
bc1d0ca37d
Merge svn changes up to r30798
2010-03-10 02:35:02 +02:00
Uoti Urpala
f7cc4152f7
Ignore svn changes up to r30752
...
More wasted work in svn duplicating changes implemented long ago in
git...
2010-03-10 01:51:55 +02:00
Uoti Urpala
e74708f619
Merge svn changes up to r30748
2010-03-10 01:50:55 +02:00
Uoti Urpala
2ad00b5319
Ignore svn changes up to r30734
2010-03-10 01:25:56 +02:00
Uoti Urpala
acdce0176a
Merge svn changes up to r30732
2010-03-10 01:25:15 +02:00
Uoti Urpala
ef3ef5e218
Ignore svn changes up to r30707
...
Already done long ago in git.
2010-03-10 01:10:07 +02:00
Uoti Urpala
194efde18f
Merge svn changes up to r30702
2010-03-10 01:08:50 +02:00
Uoti Urpala
415a39cad0
Ignore svn change r30695
2010-03-10 01:03:05 +02:00
Uoti Urpala
0dce155dd3
Merge svn changes up to r30694
2010-03-10 01:01:15 +02:00
Uoti Urpala
db7fe7ce92
Ignore svn changes up to r30686
...
Already done in git earlier.
2010-03-10 00:54:51 +02:00
Uoti Urpala
5099b1458d
Merge svn changes up to r30683
2010-03-10 00:52:17 +02:00
Uoti Urpala
5eeba24ab7
Ignore svn change r30676
...
Already done long ago in git.
2010-03-10 00:48:33 +02:00
Uoti Urpala
90f5873f1a
Merge svn changes up to r30675
2010-03-10 00:47:25 +02:00
Uoti Urpala
15a604c405
Ignore svn change r30673
...
Modifying an unused function...
2010-03-10 00:36:17 +02:00
Uoti Urpala
327463be52
Merge svn changes up to r30672
2010-03-10 00:34:16 +02:00
Uoti Urpala
7e90be7093
Ignore svn changes up to r30665
2010-03-10 00:14:34 +02:00
Uoti Urpala
13221a7165
Merge svn changes up to r30663
...
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
2010-03-10 00:13:11 +02:00
Uoti Urpala
c4f7b9666f
Ignore svn change r30644
2010-03-10 00:00:48 +02:00
Uoti Urpala
c37f09693d
Merge svn changes up to r30643
2010-03-10 00:00:06 +02:00
Uoti Urpala
22a06c4ae5
Ignore svn changes up to r30607
2010-03-09 23:45:20 +02:00
Uoti Urpala
89c5ed5e9a
Merge svn changes up to r30605
2010-03-09 23:44:57 +02:00
Uoti Urpala
0670a5d090
Ignore svn changes up to r30601
...
Most done long ago in git, and the additional changes in svn are
mostly bugs...
2010-03-09 23:42:31 +02:00
Uoti Urpala
42bf12c2d3
Merge svn changes up to r30595
...
Conflicts:
mplayer.c
vidix/nvidia_vid.c
2010-03-09 23:37:00 +02:00
Uoti Urpala
fa34ea27b9
Ignore svn changes up to r30579
2010-03-09 23:24:45 +02:00
Uoti Urpala
fa51c3b07c
Merge svn change r30576
2010-03-09 23:23:02 +02:00
Uoti Urpala
d7f7bffce5
Ignore svn changes up to r30575
2010-03-09 23:22:07 +02:00
Uoti Urpala
e03e0597d0
Merge svn changes up to r30570
2010-03-09 23:20:56 +02:00
Uoti Urpala
f910c8c9d8
Ignore svn change r30561
...
Already done in git.
2010-03-09 23:19:19 +02:00
Uoti Urpala
c31aa7b953
Merge svn change r30560
2010-03-09 23:18:19 +02:00
Uoti Urpala
ad43180c16
Ignore svn changes up to r30559
...
Something similar was already done in git, plus r305598 is wrong;
mp_core.h is not suitable for inclusion in random files throughout the
codebase.
2010-03-09 23:14:19 +02:00
Uoti Urpala
8365d174b6
Merge svn changes up to r30557
2010-03-09 23:09:46 +02:00
Uoti Urpala
7fc3bb2a88
Ignore svn changes up to r30553
2010-03-09 23:08:32 +02:00
Uoti Urpala
81c4223448
Makefile: remove outdated vf_halfpack entry
...
Remove an outdated entry left over from when vf_halfpack depended on
libswscale internals.
2010-03-09 23:06:40 +02:00
Uoti Urpala
36e7a20e69
Merge svn changes up to r30550
2010-03-09 23:03:14 +02:00
Uoti Urpala
70fb003a9f
Ignore svn change r30530
...
Already done better.
2010-03-09 22:47:58 +02:00
Uoti Urpala
8e593f5a34
Merge svn changes up to r30529
2010-03-09 22:47:41 +02:00
Uoti Urpala
bf31241e93
Ignore svn change r30515
...
Incompatible and inferior version of stream support for external
libass subs.
2010-03-09 22:42:51 +02:00
Uoti Urpala
9786d38667
subs: support loading external ASS subtitles via stream layer
...
Previously the argument of the "-sub" option was always interpreted as
a local filename when trying to read it as a libass file. Use the
stream layer to read it instead, so that protocols like 'http://' are
also supported like they are for the main video/audio file.
Based on patch by Yuriy Kaminskiy <yumkam@mail.ru>
2010-03-09 22:35:53 +02:00
reimar
e03ff1e0ef
Return MP_NOPTS_VALUE if we can't figure out the pts, not 0.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30879 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 19:21:39 +00:00
reimar
da87897b1b
Improve handling of 0-size ogg packets.
...
Fixes bug 1664.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30878 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 19:19:32 +00:00
siretart
cd4d5a8f2f
unbreak compilation after cleanups in libavutil/common.h
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30877 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-09 18:34:14 +00:00
Uoti Urpala
173beb5608
Merge svn changes up to r30514
2010-03-09 19:58:02 +02:00
Uoti Urpala
ed0237e7d3
Ignore svn changes up to r30505
2010-03-09 19:44:53 +02:00
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
