Uoti Urpala
7e65428712
Merge branch 'mplayer1_changes'
2011-05-02 00:46:03 +03:00
reimar
8c831a2e86
vo_fbdev: clip x/y offsets to avoid bad video placement
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33299 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-05-02 00:36:20 +03:00
reimar
57f700d19c
vo_fbdev: add RGB framebuffer support
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33289 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-05-02 00:36:20 +03:00
Clément Bœsch
52743acba3
cleanup: avoid various GCC warnings
2011-04-20 04:22:53 +03:00
Uoti Urpala
6d534cd3cb
vidix: drop VIDIX support
...
By now VIDIX is too obscure to justify the amount of code and
complexity it requires in the sources. Although there is no pressing
need to drop it just now from a code point of view, I'll rather remove
it before release than release with VIDIX support and then drop it
later.
Some of the manpage mentions of VIDIX were in "this option supported
for these VOs" lists that looked outdated and failed to mention vdpau
for example. Replace such incorrect lists with a generic "not
supported for all VOs" mention.
2011-01-31 16:03:10 +02:00
Uoti Urpala
c9026cb321
sub/OSD: move some related files to sub/
2011-01-26 20:39:05 +02:00
cboesch
fe3c4810e1
cleanup: remove NULL checks before free() all over the code
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 13:11:20 +02:00
Uoti Urpala
e1cd86076f
Merge svn changes up to r31141
2010-05-07 22:13:35 +03:00
cehoyos
02641f54ee
Add support for 12-bit color mode on framebuffer devices.
...
Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-06 10:18:25 +00: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
reimar
7f0c959ddc
Use FBIOPAN_DISPLAY for switching between pages, seems to work for more
...
drivers and can be much faster.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30859 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-07 17:33:13 +00:00
reimar
16ec3a5a8a
Add double-buffering support to vo_fbdev.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30858 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-07 15:55:52 +00:00
reimar
7852aff0c4
Reuse fb_tty_fd for setting up the text area.
...
This avoids the fopen call which could end up creating a /dev/tty file
if it did not exist.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30846 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 20:15:16 +00:00
Uoti Urpala
47a04d40f3
Merge svn changes up to r30250
2010-01-25 14:34:56 +02:00
reimar
52e2d23da6
Fix vo_fbdev to also work with Intel framebuffer.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30248 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-09 11:26:39 +00:00
Uoti Urpala
a2037a2eff
Merge svn changes up to r29412
2009-07-07 02:56:01 +03:00
reimar
95dcb65379
Use memcpy_pic2 instead of reimplementing it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29402 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 16:20:15 +00:00
reimar
32a7d61acc
Close /dev/tty again on uninit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29401 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:41:34 +00:00
reimar
158aca92ae
Fix indentation broken in last patch
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29400 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:39:35 +00:00
reimar
fc24a623a2
Get rid of completely pointless vt_doit variable
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29399 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:38:40 +00:00
reimar
83ed88fb96
10l, use fopen directly instead of open + fdopen
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29398 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:28:30 +00:00
reimar
b3e1578828
Use a single err_out in fb_preinit, also fixes a leak when vo_dbpp has an
...
unexpected value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29397 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:22:15 +00:00
reimar
e56dbbfd3c
Use FFALIGN and FFMAX3
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29396 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:14:48 +00:00
reimar
96de64de92
Remove useless casts
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29395 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 14:43:03 +00:00
reimar
2b19b2dcba
fbdev: remove pointless ()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29394 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 14:40:31 +00:00
Uoti Urpala
1e86963828
Merge svn changes up to r28537
2009-02-12 04:17:55 +02:00
diego
befc528297
Add standard license headers, unify header formatting.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:27:30 +00:00
Uoti Urpala
835511ac39
Merge svn changes up to r28038
2008-11-25 21:12:01 +02:00
diego
582bb322d7
Remove useless setting of frame_buffer to NULL as suggested by Reimar.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28017 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:43:13 +00:00
diego
4daa28d0a5
cosmetics: indentation
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28016 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:41:44 +00:00
diego
472e68dace
Move setting of frame_buffer variable out of 'if', as preferred by Reimar.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28015 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:40:11 +00:00
diego
5b239d47bd
Handle fb_dev_name similar to vo_fbdev in vo_wii.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27999 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 14:57:51 +00:00
diego
3e0abbff54
Remove debug function.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27993 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:41:57 +00:00
diego
92ea709db2
cosmetics: complete reformatting, tabs to spaces, etc.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27990 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:06:37 +00:00
diego
21a6361d95
cosmetics: Lessen differences to vo_wii.c.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27989 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:02:10 +00:00
diego
d0a4035bad
cosmetics: consistent formatting for if/else/case
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27988 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:46:42 +00:00
Uoti Urpala
b56858342f
Merge svn changes up to r27514
2008-09-03 10:16:30 +03:00
reimar
d54c1f0309
-geometry support for -vo fbdev.
...
Patch by Sander (thrill12 gmx net)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27475 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-22 17:26:16 +00:00
Uoti Urpala
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
diego
ad603f5559
cosmetics: Remove useless parentheses from from return statements.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 08:33:27 +00:00
Uoti Urpala
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
Uoti Urpala
de56d2d9f5
Remove variable arguments from vo control() functions
...
No voctrl uses them any more, and using them would not be a good idea
because it makes forwarding arguments to other functions harder.
2008-04-23 13:41:03 +03:00
Uoti Urpala
dbe080ec9f
Change VOCTRL_[GET|SET]_EQUALIZER argument passing
...
These were the only voctrl types with more than one argument. The
second argument was passed using variable arguments. Change them to
use a single argument (address of a struct containing both old
arguments). This makes forwarding the arguments to other functions
easier and allows simplifying code.
2008-04-23 13:41:03 +03:00
reimar
909887bdbe
Make vo info structs const
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 14:06:03 +00:00
diego
be4cb72ebe
Fix redundant redeclaration warnings.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24171 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:50:05 +00:00
reimar
6a09e8e2ed
Replace implicit use of fast_memcpy via macro by explicit use to allow
...
for future optimization.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +00:00
rathann
f78363e244
Remove spurious casts to int. Blessed by Reimar.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20116 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 16:40:11 +00:00
pacman
2857c2e4d4
Don't multiply fb_line_len by fb_pixel_size. Fixes too-low placement of OSD
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17902 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-20 22:24:14 +00:00
pacman
6a6fec3656
Don't try to parse fb.modes more than once. Fixes playback of multiple files
...
with mplayer -vm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17901 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-20 22:07:30 +00:00