Commit Graph

31981 Commits

Author SHA1 Message Date
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
Uoti Urpala 7c4dbb8a20 demux_mkv: enable automatic index generation by default
Change demux_mkv to behave by default as it did with -idx before. The
index generation code in demux_mkv linearly scans the file up to the
seek timestamp (it doesn't read the whole file up front like some
other demuxers do). Doing that is probably a better default for files
with no index than rejecting the seek request and asking user to
specify -idx.
2010-06-02 19:30:40 +03:00
Uoti Urpala 80be936a56 Merge svn changes up to r31303 2010-06-02 19:12:01 +03:00
Uoti Urpala ed1a1e28d8 Skip svn changes up to r31294 (mostly)
-a52drc range extension was already done earlier (and the svn commit
is buggy for ad_liba52). However keep the man page change (this is the
only part not skipped).

We don't want to use lavf for Matroska demuxing; it's questionable
whether that's a good idea even in svn, and the internal demuxer here
is definitely a better choice.
2010-06-02 18:58:37 +03:00
Uoti Urpala 497c32cdad Merge svn changes up to r31291 2010-06-02 18:55:18 +03:00
Uoti Urpala 626373af38 Skip svn changes up to r31287 2010-06-02 18:40:56 +03:00
Uoti Urpala 9d14cec1d7 ad_ffmpeg: set lavc drc_scale parameter according to opts->drc_level 2010-06-02 18:38:24 +03:00
Uoti Urpala 3f076c0fb3 options: move -a52drc to option struct
Also allow a range up to 2.
2010-06-02 18:34:21 +03:00
Uoti Urpala 57e0904baa Skip svn change r31285
Internal FFmpeg build stuff.
2010-06-02 17:59:35 +03:00
Uoti Urpala 5aa7c02984 Merge svn changes up to r31284 2010-06-02 17:59:10 +03:00
Uoti Urpala 0f95b70314 Skip svn changes up to r31280
Mostly stuff related to internal FFmpeg builds only.
2010-06-02 17:55:16 +03:00
Uoti Urpala 8f952b0f0b Merge svn changes up to r31275 2010-06-02 17:53:26 +03:00
Uoti Urpala df8cac6f07 Skip svn changes up to r31267
Perhaps porting some of the non-pkgconfig libass detection logic from
configure would have some use, but I'm not doing it now at least.
2010-06-02 17:50:52 +03:00
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
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
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
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
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
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
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