diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-19 00:28:17 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-09-19 00:28:17 +0300 |
| commit | 3f215c9f8e4d5d95ac9b45376460391669906236 (patch) | |
| tree | 1f675ef31908400c3411ace5182ca015c57000aa /libvo/vo_xv.c | |
| parent | 82bbf1a1ab1affc675e9b69b93e33accfa2ed0b8 (diff) | |
| parent | c2d0a9c8a78b20ed8e96ff5a7d3e8c936b82cae1 (diff) | |
| download | mpv-3f215c9f8e4d5d95ac9b45376460391669906236.tar.bz2 mpv-3f215c9f8e4d5d95ac9b45376460391669906236.tar.xz | |
Merge branch 'vdpau' into build
* vdpau: (22 commits)
VO: Prefer vo_vdpau over vo_xv again
vo_vdpau: Fix X event handling bugs
vo_vdpau: Fix memory corruption bug with MP_IMGTYPE_NUMBERED
core/VO: Allow VO drivers to add/modify frames
video_out.h: Cosmetics
VO interface: Remove obsolete draw_frame() from new interface
vo_vdpau: Support recovering from VDPAU display preemption
vo_vdpau: Support updating OSD while paused
vo_vdpau.c: Reindent control() switch statement
vo_vdpau: Allocate one large surface for EOSD content
vo_vdpau.c: cosmetics
vo_vdpau: reindent after GUI code removal
vo_vpdau: Clean up uninit logic
vo_vdpau: Make CHECK_ST macro safer
vo_vdpau: Move all remaining static/global variables to context
vo_vdpau: Move things to context struct
vo_vdpau: Make info struct const
vo_vdpau: Replace global function table with context variable
vo_vdpau: Move VDPAU interface pointers into one struct
vo_vdpau: Add template file for VDPAU functions
...
Diffstat (limited to 'libvo/vo_xv.c')
| -rw-r--r-- | libvo/vo_xv.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 2fe1616eb3..f9579c1e19 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -518,11 +518,6 @@ static int draw_slice(struct vo *vo, uint8_t *image[], int stride[], int w, return 0; } -static int draw_frame(struct vo *vo, uint8_t *src[]) -{ - return VO_ERROR; -} - static uint32_t draw_image(struct vo *vo, mp_image_t *mpi) { struct xvctx *ctx = vo->priv; @@ -840,7 +835,6 @@ const struct vo_driver video_out_xv = { .preinit = preinit, .config = config, .control = control, - .draw_frame = draw_frame, .draw_slice = draw_slice, .draw_osd = draw_osd, .flip_page = flip_page, |