diff options
| author | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-13 19:55:48 +0900 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-13 19:55:48 +0900 |
| commit | 3287825bd2ee762a918961383604697358765397 (patch) | |
| tree | d3513ec0b91a5c3832221c5b74225deb85fb2163 /player/client.c | |
| parent | 9e65b5db0bf79b31c7816d1fdba77ea18fe82690 (diff) | |
| parent | f43017bfe97c07aa73206d8d1388294cdbee628f (diff) | |
| download | mpv-3287825bd2ee762a918961383604697358765397.tar.bz2 mpv-3287825bd2ee762a918961383604697358765397.tar.xz | |
Merge branch 'master' into release/0.9
* master: (39 commits)
Update license headers
af_lavrresample: minor simplification
af_lavrresample: allow resetting output sample format
audio/filter: fully renegotiate audio formats on every reconfig
DOCS/waf: Edit --enable-feature sentences
vo_opengl: slightly simplify check_gl_features()
vo_opengl: unify blend-subtitles-res and blend-subtitles
vo_opengl: fix blend-subtitles-res=video & anamorphic video
manpage: mention how pseudo-gui mode is enabled on win32
main-fn-win: fix handle validity check for XP
win32: use pseudo-gui profile when started without stdio
win32: only attach to the console from mpv.com
win32: use a platform-specific unicode entry-point
vo_opengl: add blend-subtitles-res
manpage: document pseudo-gui stuff
mp_image: remove redundant flags field
mp_image: remove redundant chroma_x/y_shift fields
mp_image: remove redundant plane_w/h fields
player: use config parser for setting up pseudo-gui profile
player: change pseudo-gui settings
...
Diffstat (limited to 'player/client.c')
| -rw-r--r-- | player/client.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/player/client.c b/player/client.c index 3593b1d99f..614d64205f 100644 --- a/player/client.c +++ b/player/client.c @@ -1705,7 +1705,11 @@ int mpv_opengl_cb_init_gl(mpv_opengl_cb_context *ctx, const char *exts, { return MPV_ERROR_NOT_IMPLEMENTED; } -int mpv_opengl_cb_render(mpv_opengl_cb_context *ctx, int fbo, int vp[4]) +int mpv_opengl_cb_draw(mpv_opengl_cb_context *ctx, int fbo, int w, int h) +{ + return MPV_ERROR_NOT_IMPLEMENTED; +} +int mpv_opengl_cb_report_flip(mpv_opengl_cb_context *ctx, int64_t time) { return MPV_ERROR_NOT_IMPLEMENTED; } @@ -1715,6 +1719,11 @@ int mpv_opengl_cb_uninit_gl(mpv_opengl_cb_context *ctx) } #endif +int mpv_opengl_cb_render(mpv_opengl_cb_context *ctx, int fbo, int vp[4]) +{ + return mpv_opengl_cb_draw(ctx, fbo, vp[2], vp[3]); +} + void *mpv_get_sub_api(mpv_handle *ctx, mpv_sub_api sub_api) { if (!ctx->mpctx->initialized) |