920ee4dc53
spudec.c: mark a parameter const
...
Mark constant sws_spu_image() parameter as const, fixes the warning:
spudec.c:874: warning: passing argument 2 of 'sws_scale' from incompatible pointer type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31959 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:48 +02:00
269d3df12c
dvdnav: Support for image highlights for dvdnav menus.
...
Does not work 100% reliably and needs -sid 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31828 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
1ee113088f
spudec.c: Remove useless end_col/end_row variables
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31827 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
68200fa565
spudec.c: Slightly simplify rle decoding
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31799 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
599647ff8c
spudec.c: Remove a useless condition check
...
It's already handled a few lines further down (the len == 0 check).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31798 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
63cc56045a
spudec.c: Avoid useless malloc/frees
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31797 b3059339-0415-0410-9bf9-f77b7e298cf2
Remove unused variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31800 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
37097806be
spudec.c: Remove useless NULL checks before free()
...
Also set pointers to NULL after freeing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31792 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
a5e9d3b56a
spudec: Allocate memory for paletted image data separately
...
Use a separate allocation to avoid issues with e.g. the "cut" function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31791 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
4533ea0d55
spudec: Slightly simplify dvd subtitle RLE decoding
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31790 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
af62b02a63
spudec: Share paletted -> gray/alpha conversion code
...
Also keep a copy of the raw rle-decoded data. Should simplify
implementing palette changes and the rle decoding code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31789 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
dd886133a9
spudec: Simplify creation of color/alpha map
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31788 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
15575403e5
spudec: Faster paletted to OSD conversion
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31707 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
95db5dd48c
spudec: Fix conversion from paletted to MPlayer's OSD format
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31705 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
bd2f8560aa
spudec: Reuse spudec_draw for the unscaled case
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31703 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
8c00770615
spudec.c: minor improvements
...
Remove useless casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31702 b3059339-0415-0410-9bf9-f77b7e298cf2
Simplify alpha conversion code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31704 b3059339-0415-0410-9bf9-f77b7e298cf2
Document code inefficiency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31706 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
16a14da730
spudec: Fix calc_bbox to always return sensible values
...
When the scaled width is equal to the current width we could reuse the
previous bbox value, however we havent saved them anywhere...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31701 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
1bcb3fc805
subs: improve scaling for avcodec subs
...
Try to get subtitle scaling somewhat right with libavcodec decoded
bitmap subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31697 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
4a466e9573
spudec.c: add missing orig_frame_width setting
...
10l, also assign the original width in spudec_new_scaled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31696 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
ba08c0e690
spudec.c: indentation fix
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31695 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
96c17fe68b
subs: Add support for PGS subtitle decoding via libavcodec
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31665 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
d6322407c5
subs: change subdelay handling and vobsub timing
...
Make subdelay handling work the same way for all subtitle types and
also allow changing subtitle delay to work better with vobsubs.
This probably breaks vobsub behaviour with timestamp wrapping though.
Positive values for sub delay now delay subtitles compared to video,
where before the effect was in the opposite direction.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31663 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
1882a37adb
spudec.c: simplify
...
Reuse spudec_visible to avoid code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31661 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
4a9c879ca7
spudec: Add warning about bad values in bounding box handling
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31660 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
dd70420bb8
spudec.c: Extract image allocation code to a separate function
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31659 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:37 +02:00
80be936a56
Merge svn changes up to r31303
2010-06-02 19:12:01 +03:00
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
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
8df340271e
Merge svn changes up to r31040
2010-04-26 18:38:11 +03:00
b768120998
Remove dead code.
...
Patch by ubitux, ubitux gmail
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31037 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-14 08:53:19 +00:00
8a70b9ad85
typo fix found by ubitux
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31035 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-13 01:26:20 +00:00
fa51c3b07c
Merge svn change r30576
2010-03-09 23:23:02 +02:00
8e593f5a34
Merge svn changes up to r30529
2010-03-09 22:47:41 +02:00
12d3caebc7
Merge svn changes up to r30475
2010-03-09 19:18:43 +02:00
93c1e23c47
Mark some more functions that are not used outside of their files as static.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30632 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-18 09:26:00 +00:00
56e0f7fe9e
Avoid using sscanf for basic parsing, it is horribly slow.
...
Now uses strncmp as a first step, which is 40 times faster.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30576 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-14 13:57:30 +00:00
aedd1b4de8
Fix subtitle display for DVDs using fade-in/fade-out.
...
This does not do the actual fading, this is not supported by MPlayer,
but will just use the highest alpha value used during display.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30524 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-06 19:57:45 +00:00
e008f62627
Make mkalpha function simpler, faster and more correct.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30523 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-06 19:18:09 +00:00
99c1bbca2a
Add license header to all top-level files missing them.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 23:24:23 +00:00
d6c410b54c
Replace libavutil internal header #includes with MPlayer copies
...
Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h
and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/
instead.
2009-07-26 06:16:43 +03:00
0eb321bf2c
Remove trailing whitespace from most files
2009-07-07 02:34:35 +03:00
6e9cbdc104
whitespace cosmetics: Remove all trailing whitespace.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-13 02:58:57 +00:00
9bcd12fdf5
Merge svn changes up to r28310
...
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
2009-01-15 05:57:31 +02:00
2641f96246
Simplify and comment spudec bilinear scaling code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28223 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-01 11:33:46 +00:00
479f5e742f
Merge svn changes up to r27841
...
Conflicts:
mplayer.c
2008-10-28 04:12:18 +02:00
97293969b4
Factorize vobsub idx/extradata handling.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27841 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-27 22:51:22 +00:00
f6dfaf26f8
Make various functions static
2008-08-12 14:57:12 +03:00
d5c868325c
Merge svn changes up to r26979
...
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
2008-06-04 08:10:48 +03:00
5423c418c2
cosmetics: Remove useless parentheses from return statements.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 09:42:28 +00:00
8716df2a41
Add context variable to vo_draw_text callback
...
Add a context variable and rename the function to osd_draw_text. Create
a new vo_draw_text that is a wrapper for VOs using old API.
2008-04-23 13:41:04 +03:00
2bcfe1e077
Add new video driver API
...
Create new video driver API that has a per-instance context structure
and does not rely on keeping status in global or static variables.
Existing drivers are not yet converted to this API; instead there is a
wrapper which translates calls to them.
In the new API, an old API call vo_functions->xyz(args) is generally
replaced by vo_xyz(vo_instance, args).
The changes to keep the vesa, dxr2 and xover drivers compiling have
not been tested.
2008-04-23 13:41:04 +03:00
diego
reimar
Uoti Urpala
cehoyos
compn
aurel
Uoti Urpala