diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:07:37 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-18 01:45:36 +0200 |
| commit | 186e5a998c8424b3c850b62d6f5755a0928cd64c (patch) | |
| tree | cabc9881fb5ed2c6dbe5f771323a55c50136a091 /libmpcodecs/vd.c | |
| parent | 41ac08d2b45f0f6eb369ea57604796be69200185 (diff) | |
| parent | e5ee1232c5e00e730d69cf57767b1ee3ab5b4e16 (diff) | |
| download | mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.bz2 mpv-186e5a998c8424b3c850b62d6f5755a0928cd64c.tar.xz | |
Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
Diffstat (limited to 'libmpcodecs/vd.c')
| -rw-r--r-- | libmpcodecs/vd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 86b9f0c511..22bdddc909 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -336,7 +336,8 @@ mp_image_t *mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, mp_image_t *mpi = vf_get_image(sh->vfilter, sh->codec->outfmt[sh->outfmtidx], mp_imgtype, mp_imgflag, w, h); - mpi->x = mpi->y = 0; + if (mpi) + mpi->x = mpi->y = 0; return mpi; } |