reimar
7e9ff557a0
Extend -vf format to allow substituting the format for a compatible one
...
(e.g. chaning rgb24 to bgr24).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31331 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:55:20 +00:00
reimar
1689c3422f
Fix -vf format and -vf noformat to work with slices.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31330 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:45:35 +00:00
reimar
bb90bfbd08
Add webm/VP8 support to native matroska demuxer.
...
Patch by James Zern [jzern google com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31329 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:32:11 +00:00
reimar
09bca6575f
If we have no FPS value, try enabling -correct-pts mode, it does
...
not require any FPS value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31328 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:46:25 +00:00
reimar
eced1edd7e
Add partial support for dirac to TS demuxer.
...
E.g. no header parsing is implemented so -fps must be specified manually.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31327 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:37:10 +00:00
reimar
29b2cae621
Also print current stream position in mp_read debug output.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31326 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:14:56 +00:00
reimar
1581d9deb2
Remove explicit eof check for mp_read code, stream code handles this case
...
better, e.g. properly supporting growing files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31325 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:12:36 +00:00
reimar
159f5f451d
Di not do a stream_reset on seeking backwards, the seek itself should
...
do whatever is best/necessary, this method will just drop cached data.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31324 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 16:00:49 +00:00
reimar
244b884728
Do not make seek fail explicitly simply because eof was hit somewhen,
...
instead reuse the eof checking code further down.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31323 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 15:57:57 +00:00
cehoyos
ef14d50ad6
Fix compilation after FFmpeg r23485.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31322 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 13:44:20 +00:00
jrash
7b50ebd44b
sync with en/mplayer.1 rev. 31292
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31321 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 11:38:19 +00:00
reimar
5377f6a0c3
Remove colorspace conversion code from -vo yuv4mpeg, -vf scale should
...
be able to handle this just as well (or better) including interlaced.
If not, this needs to be fixed there instead of duplicating code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31320 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 06:45:01 +00:00
reimar
06d20bd774
Sync libdvdcss with their latest SVN.
...
In particular fixes a wring return value check which caused descrambling
to be aborted for no good reason.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31319 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 06:41:43 +00:00
reimar
e22ebfddb1
Add support for -geometry x syntax since the documentation claims
...
it is supported.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31318 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 06:28:58 +00:00
reimar
5bd98b116a
Do not use libass functions if it is disabled.
...
Fixes compilation if freetype is not available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31317 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-04 18:46:22 +00:00
reimar
e41db02518
Default to -correct-pts off if -fps was given, since -fps has no effect
...
(and doesn't really make sense) with correct-pts mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31316 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-04 17:11:56 +00:00
reimar
f0e84a0b23
Force window placement also if -xineramascreen was set >= 0,
...
not only if -geometry was given.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31315 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-04 17:10:38 +00:00
siretart
9e2e3a1cb8
apply missing bits from cd4e8dc1fa
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31314 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 21:50:08 +00:00
reimar
637edc7a27
Try always enabling correct pts again for lavf demuxer, since the know
...
issue with PAFF seems solved to me, and disabled correct-pts causes
flickering with -ass (which of course should be fixed as well though).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31313 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 21:01:37 +00:00
reimar
82aabb77d3
Limit buffered PTS only when we actually got a frame from the decoder.
...
This avoids some issues with H.264 PAFF due to dropping PTS values too
early because only every second packet actually produced output.
Just keeping up to one additional pts value would have avoided this
particular issue as well, but this is more generic.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31312 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 20:59:40 +00:00
reimar
9343d1cb2d
If an invalid pts value is detected, try to to make up some if it seems
...
reasonable.
This avoids completely losing A-V sync e.g. when pts was not reordered correctly.
This was tested with http://samples.mplayerhq.hu/V-codecs/h264/PAFF/tv_cut.mkv
for this sample proper pts reordering is the correct solution, but more resilient
handling of the error case is still useful.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31311 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 20:39:41 +00:00
siretart
d6d87593a7
vo_yuv4mpeg: disable RGB support when compiling against a shared libswscale
...
This avoids using swscale internals when compiling against a shared libswscale.
Patch inspired by Uoti Urpala's work in his git branch:
cd4e8dc1fa
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31310 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 17:37:58 +00:00
cehoyos
de6a0324d8
Simplify libass version check.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31309 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 08:17:51 +00:00
cehoyos
67a5bb95ee
Raise LIBASS_VERSION, forgotten in r31293.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31308 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 08:17:10 +00:00
reimar
9b04897e76
Add the -march fallback for amdfam10 also to the x86_64 case.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31307 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 22:09:04 +00:00
cehoyos
ac02b9ee47
libavcodec/libx264.c requires x264 0.98 since r23430.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31306 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 20:50:55 +00:00
cehoyos
0cded5de1c
Fix compilation with external libass.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31305 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 20:21:29 +00:00
cehoyos
1c906775a0
ass_set_aspect_ratio() takes three arguments since 0x00907010.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31304 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 20:12:50 +00:00
siretart
1cbf1ec468
avoid using swscale internals by copying in palette8torbg16 and its bgr variant
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31303 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 21:07:02 +00:00
reimar
988b04eb2d
Extend geometry parsing to reject all invalid strings.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31302 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 20:12:58 +00:00
siretart
b2dc062825
deprecate palette8topacked32 in favor of public API functions sws_convertPalette8ToPacked32 and -24
...
additionallym deprecate palette8torgb16 and its bgr variant without
replacement. These functions are not meant to be used by applications.
Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31301 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 19:35:16 +00:00
stefano
cf9c1948f8
Move internal scale context fields initialization from
...
sws_setColorspaceDetails() to ff_yuv2rgb_c_init_tables().
Allow to factorize duplicated code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31300 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 11:30:07 +00:00
cehoyos
d9396facdc
Fix compilation after FFmpeg r23402.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31299 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 10:28:45 +00:00
siretart
88c4cbb3f9
remove palette8torgb15 and palette8tobgr15
...
They contain exactly the same code as their 16bit variants, so this is
effectively code de-duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31298 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 06:53:56 +00:00
reimar
e629ec20bc
Factor out some common code and ensure we will not try to draw OSD
...
elements outside the streams and thus crash.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31297 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-31 21:24:00 +00:00
reimar
ad7448b623
Reindent.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31296 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-31 21:16:02 +00:00
reimar
ec955f02fd
Fix subtitle display for http://samples.mplayerhq.hu/sub/largeres_vobsub.mkv
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31295 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-31 21:15:20 +00:00
aurel
9be39d0640
Switch mkv demuxing to lavf by default.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31294 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-31 19:44:02 +00:00
aurel
e123aecb48
backport ass_flush_events() from upstream libass and make use of it
...
This fixes subtitles duplication when seeking back in ass stream formated
with the "standard" format FFmpeg uses.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31293 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-31 19:10:57 +00:00
reimar
c071c9e805
Extend the range of the -a52drc range up to two, as a experimental feature
...
in case someone finds it useful.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31292 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-31 17:12:27 +00:00
diego
def243261a
Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31291 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 22:14:13 +00:00
Gabrov
a849e05e2c
synced with r31289
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31290 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 22:11:32 +00:00
reimar
233c74254e
Change code to let Window Manager chose window location by default.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31289 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 19:14:18 +00:00
reimar
326ec00733
Add a referrer option to set the HTTP Referer field.
...
Patch by chocolateboy [chocolate cpan org]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31288 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 16:50:02 +00:00
reimar
a8dab8b521
Forgotten part of previous commit (extern declaration of drc_level).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31287 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 16:48:18 +00:00
reimar
b19b09df54
Use the -a52drc option also for the libavcodec decoder.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31286 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 16:46:31 +00:00
cehoyos
971633b168
Fix compilation without librtmp.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31285 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 14:29:18 +00:00
reimar
49c904b517
Treat a NULL renderer string as indication for software renderer.
...
Usually it means OpenGL will not work at all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31284 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 13:51:24 +00:00
reimar
f316f63910
Prefer -vo sdl over "probably software" OpenGL.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31283 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 13:50:14 +00:00
reimar
3ae81e84be
Change compiler argument order for compile_check to avoid incorrect linking
...
errors during detection with static libraries (in particular OpenGL + static SDL).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31282 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 12:14:40 +00:00