diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
commit | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (patch) | |
tree | 3d4a19a910d34be6ee7cd4841876a4318d5c243d /libmpcodecs/vd_lzo.c | |
parent | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (diff) | |
parent | 09bf506c34a73d587c999ce161a0714159e1e5b6 (diff) | |
download | mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.bz2 mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.xz |
Merge svn changes up to r28461
Diffstat (limited to 'libmpcodecs/vd_lzo.c')
-rw-r--r-- | libmpcodecs/vd_lzo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vd_lzo.c b/libmpcodecs/vd_lzo.c index a49a418e26..a60436cbe5 100644 --- a/libmpcodecs/vd_lzo.c +++ b/libmpcodecs/vd_lzo.c @@ -55,7 +55,7 @@ static int init(sh_video_t *sh) return 0; } priv->bufsz = sh->bih->biSizeImage; - priv->buffer = malloc(priv->bufsz + LZO_OUTPUT_PADDING); + priv->buffer = malloc(priv->bufsz + AV_LZO_OUTPUT_PADDING); priv->codec = -1; sh->context = priv; @@ -88,7 +88,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) return NULL; // skipped frame } - r = lzo1x_decode(priv->buffer, &w, data, &len); + r = av_lzo1x_decode(priv->buffer, &w, data, &len); if (r) { /* this should NEVER happen */ mp_msg (MSGT_DECVIDEO, MSGL_ERR, |