Commit Graph

3558 Commits

Author SHA1 Message Date
reimar 94f543d114 libvo/w32_common.c: Move setting of pixel format from init to config
This allows it to depend on flags etc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32619 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 12:31:10 +02:00
reimar 00b2a5d7b2 libvo/w32_common.c: minor cleanup
Some indentation fixes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32611 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify: Use early return instead of large if block.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32612 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-14 12:23:56 +02:00
diego 12d3e0df99 cleanup: don't check for NULL before free()
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:12 +02:00
komh ffbc561f96 vo_kva: Restore all the attributes after changing aspect ratio
kvaSetup() resets all the attributes, so there is need to restore them.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32570 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:49:51 +02:00
komh 163ae34e96 vo_kva: Prevent a parent window from painting over ours in slave mode
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32569 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:49:10 +02:00
reimar 0142db087b vo_directx: Fix possible out-of-bounds access
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32568 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-07 21:48:37 +02:00
Clément Bœsch 952f9b85a7 options: move -name and -title to option struct 2010-11-04 05:54:12 +02:00
cigaes ce9fcc0730 vo_gl: Move the read_pnm function into a separate file
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32513 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:37 +02:00
reimar 2865993869 vo_gl: Extract code to read a pnm file into a separate function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32479 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar 4590600a42 vo_dxr3: Fix validity checks before closing a file descriptor
-1 is invalid (and the initial value), 0 is not.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32467 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar 26108aa19a vo_dxr3: Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32466 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar 8fe2291c53 vo_mga: minor code cleanup
Spelling fix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32459 b3059339-0415-0410-9bf9-f77b7e298cf2

Use FFALIGN macro.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32460 b3059339-0415-0410-9bf9-f77b7e298cf2

Spelling fix.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32461 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar 57300e6ec7 vo_xmga: Remove an unmotivated and pointless panscan_calc call
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32458 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar 41657da91e vo_xvidix: reconfigure also on window move
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32457 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar 79f6a2c868 vo_xmga: fix event handling
Fix xmga event handling: Reconfigure hardware on move and resize,
redraw colorkey on resize and expose.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32456 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar 69d173dfbb vo_xmga: Remove a useless MGA_VID_CONFIG ioctl
set_window already does this.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32455 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar fef7b17c34 x11_common: add VO_EVENT_MOVE
Add VO_EVENT_MOVE which is required for VOs that interact directly
with hardware like MGA and VIDIX.

Patch by Dirk Porezag [porezag yahoo com]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32454 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar 107845e9db vo_mga: switch to newer screen dimension handling API
Switch (x)mga vo to new libvo API to reduce code duplication and improve
consistency between vos.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32453 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar deba9f3d2b aspect.c: use fallback if screen dimensions are not known
Add fallback values to aspect_save_screenres to avoid division by 0
if screen dimensions are not known.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32452 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix handling of invalid values in aspect_save_screenres to not overwrite
valid values.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32481 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:09 +02:00
reimar db90a65d11 Remove remaining %lf printf conversions
Most cases are just code in comments.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32438 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego 690bcb7b2c libvo: remove UNUSED() macros
Remove UNUSED macros used to shut up unused function parameter warnings.
The macros are duplicated all over libvo and serve no useful purpose
nowadays.  A better way to shut up the warnings is -Wno-unused-parameter.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32422 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:08 +02:00
diego efd24e30dd vesa_lvo.c: make functions static
Mark functs not used outside of the file as static, remove from header; fixes:
libvo/vesa_lvo.c:187: warning: no previous prototype for 'vlvo_draw_slice'
libvo/vesa_lvo.c:205: warning: no previous prototype for 'vlvo_draw_frame'
libvo/vesa_lvo.c:214: warning: no previous prototype for 'vlvo_flip_page'
libvo/vesa_lvo.c:275: warning: no previous prototype for 'vlvo_draw_osd'
libvo/vesa_lvo.c:312: warning: no previous prototype for 'vlvo_query_info'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32288 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:56 +02:00
diego 14c22f8236 vesa_lvo.c: Move vlvo_preinit() below the functions that it uses
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32287 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego 03e539f38c vo_vesa: Mark vlvo_draw_slice_420() as static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32286 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego c310e7cedc vo_vesa: mark a function static
Mark fillMultiBuffer() as static, it is not used outside of the file; fixes:
libvo/vo_vesa.c:532: warning: no previous prototype for 'fillMultiBuffer'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32284 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego 21ea779e7a vo_vesa, vo_directfb2: Replace local min/max macros by FFMIN/FFMAX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32282 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
ramiro 32013b621c vo_mga: use libswscale interface for g200 (untested)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32280 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego 7452eb2948 vo_caca: Update URL to patch for new API support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32260 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego 868fb5d278 build: update DirectFB requirements, reduce #ifdefs
Require DirectFB version 0.9.15 instead of 0.9.13.
This simplifies the build system at the cost of requiring a library
version that was released at the end rather than the middle of 2002.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32251 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify DirectFB check.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32252 b3059339-0415-0410-9bf9-f77b7e298cf2

Require DirectFB version 0.9.22.
This allows getting rid of a lot of library version check #ifdeffery.
Release 0.9.22 is from February 2005, so the requirement is reasonable.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32253 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
Uoti Urpala c5e462b33d build: enable/disable all FFmpeg libraries together
Enable all of libavcodec, libavformat, libswscale, and libpostproc
together (libavutil is always required).

based on svn commit by diego:

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:55 +02:00
diego eb67fe1a34 vo_corevideo.h: Add standard multiple inclusion guards
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32210 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego e02012a4af vo_ivtv; Move ivtv_fd extern variable declaration to vo_ivtv.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32159 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego 816da6109a vo_v4l2: Move v4l2_fd extern declaration to vo_v4l2.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32158 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
diego e0f8f99a19 ao_mpegpes,vo_mpegpes: Rename vo_mpegpes_fd2 variable to ao_mpegpes_fd
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32154 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:46 +02:00
ramiro fdce82091e mga: disable g200 support
g200 should use the swscale interface to convert to nv12. If anyone still uses
such a card and is willing to test, just let me know.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32111 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
diego f2899d96ee Add central init_avcodec() to avoid duplicated libavcodec init code
Patch by Vlad Seryakov, vseryakov gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32043 b3059339-0415-0410-9bf9-f77b7e298cf2

Refactor more instances of avcodec_initialized handling into init_avcodec().
This is a leftover from the previous commit.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32044 b3059339-0415-0410-9bf9-f77b7e298cf2

Add missing #include for vd_ffmpeg.h; fixes the warning:
libmpcodecs/vf_zrmjpeg.c:472: warning: implicit declaration of function 'init_avcodec'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32176 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:51 +02:00
siretart 2e6ff523dd spelling fixes
Found by the Debian QA tool 'lintian'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31913 b3059339-0415-0410-9bf9-f77b7e298cf2

reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:03 +02:00
reimar 91565a3d77 vo_gl.c: Use early return instead of large if block
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31887 b3059339-0415-0410-9bf9-f77b7e298cf2

Reindent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31888 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
reimar 0edb9e62d0 vo_gl: Make OSD rendering code more readable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31886 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:15:01 +02:00
reimar cc6428a72c vo_corevideo: Move variable into the only function it's used in
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31826 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 2e6847a352 vo_corevideo: move mouse hiding to check_events
Move mouse hiding code to check_events, this allows mouse hiding
to continue to work with -idle -fixed-vo, after the video has
finished but the last frame is still displayed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31825 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 902417b999 vo_corevideo: Make the Quit menu entry work
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31824 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 5a1689d894 vo_corevideo: simplify check_events
Simplify check_events: avoid seemingly pointless untilDate argument.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31823 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar d612a71f39 vo_corevideo: change window-closing handling
Change window-closing handling so it works properly if the
KEY_CLOSE_WIN is rebound to e.g. skip to next file or not
bound at all.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31822 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:46 +02:00
reimar 59524e7a3f vo_corevideo, vo_quartz: remove useless kQuitCmd
Remove kQuitCmd, it has no purpose or effect at all.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31811 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove unused kQuitCmd from vo_quartz.
While just as useless as for corevideo, the "Quit"
menu item at least works through kHICommandQuit here.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31812 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 79662b6f19 vo_corevideo: indentation fixes
Cosmetics: indentation fixes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31808 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix indentation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31810 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 465839a395 vo_corevideo: Avoid some code duplication.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31809 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar f4f8c1f7e9 vo_corevideo: Simplify update_screen_info
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31806 b3059339-0415-0410-9bf9-f77b7e298cf2

Avoid some code duplication in update_screen_info.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31807 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 0a5ff5eef3 vo_corevideo: avoid dangerous casts
Declare variables with proper types to avoid dangerous pointer casts.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31805 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar 5f5a12a939 vo_corevideo.m: remote useless parentheses and casts
Remove useless ().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31802 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove yet more useless ()

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31803 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove pointless casts.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31804 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00