Mercurial > libavcodec.hg
changeset 8732:967c0a1a60a0 libavcodec
Add av_ prefix to LZO stuff and thus make it officially part of the public API.
Keep lzo1x_decode until the next major version bump for binary compatibility.
| author | reimar |
|---|---|
| date | Mon, 02 Feb 2009 20:16:00 +0000 |
| parents | 6a1ef00ca991 |
| children | 91007f70b81a |
| files | cscd.c nuv.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/cscd.c Mon Feb 02 18:51:02 2009 +0000 +++ b/cscd.c Mon Feb 02 20:16:00 2009 +0000 @@ -158,7 +158,7 @@ switch ((buf[0] >> 1) & 7) { case 0: { // lzo compression int outlen = c->decomp_size, inlen = buf_size - 2; - if (lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen)) + if (av_lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen)) av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); break; } @@ -232,7 +232,7 @@ c->linelen = avctx->width * avctx->bits_per_coded_sample / 8; c->height = avctx->height; c->decomp_size = c->height * c->linelen; - c->decomp_buf = av_malloc(c->decomp_size + LZO_OUTPUT_PADDING); + c->decomp_buf = av_malloc(c->decomp_size + AV_LZO_OUTPUT_PADDING); if (!c->decomp_buf) { av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); return 1;
--- a/nuv.c Mon Feb 02 18:51:02 2009 +0000 +++ b/nuv.c Mon Feb 02 20:16:00 2009 +0000 @@ -116,7 +116,7 @@ avctx->width = c->width = width; avctx->height = c->height = height; c->decomp_size = c->height * c->width * 3 / 2; - c->decomp_buf = av_realloc(c->decomp_buf, c->decomp_size + LZO_OUTPUT_PADDING); + c->decomp_buf = av_realloc(c->decomp_buf, c->decomp_size + AV_LZO_OUTPUT_PADDING); if (!c->decomp_buf) { av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); return 0; @@ -175,7 +175,7 @@ buf_size -= 12; if (comptype == NUV_RTJPEG_IN_LZO || comptype == NUV_LZO) { int outlen = c->decomp_size, inlen = buf_size; - if (lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) + if (av_lzo1x_decode(c->decomp_buf, &outlen, buf, &inlen)) av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); buf = c->decomp_buf; buf_size = c->decomp_size;