diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/tscc.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/tscc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/contrib/ffmpeg/libavcodec/tscc.c b/contrib/ffmpeg/libavcodec/tscc.c index a24540f37..1453eb568 100644 --- a/contrib/ffmpeg/libavcodec/tscc.c +++ b/contrib/ffmpeg/libavcodec/tscc.c @@ -121,14 +121,14 @@ static int decode_rle(CamtasiaContext *c, unsigned int srcsize) } } else if (c->bpp == 16) { for(i = 0; i < p2; i++) { - pix16 = LE_16(src); + pix16 = AV_RL16(src); src += 2; *(uint16_t*)output = pix16; output += 2; } } else if (c->bpp == 32) { for(i = 0; i < p2; i++) { - pix32 = LE_32(src); + pix32 = AV_RL32(src); src += 4; *(uint32_t*)output = pix32; output += 4; @@ -140,7 +140,7 @@ static int decode_rle(CamtasiaContext *c, unsigned int srcsize) switch(c->bpp){ case 8: pix[0] = *src++; break; - case 16: pix16 = LE_16(src); + case 16: pix16 = AV_RL16(src); src += 2; *(uint16_t*)pix = pix16; break; @@ -148,7 +148,7 @@ static int decode_rle(CamtasiaContext *c, unsigned int srcsize) pix[1] = *src++; pix[2] = *src++; break; - case 32: pix32 = LE_32(src); + case 32: pix32 = AV_RL32(src); src += 4; *(uint32_t*)pix = pix32; break; @@ -261,7 +261,6 @@ static int decode_init(AVCodecContext *avctx) int zret; // Zlib return code c->avctx = avctx; - avctx->has_b_frames = 0; c->pic.data[0] = NULL; c->height = avctx->height; @@ -283,7 +282,7 @@ static int decode_init(AVCodecContext *avctx) case 24: avctx->pix_fmt = PIX_FMT_BGR24; break; - case 32: avctx->pix_fmt = PIX_FMT_RGBA32; break; + case 32: avctx->pix_fmt = PIX_FMT_RGB32; break; default: av_log(avctx, AV_LOG_ERROR, "Camtasia error: unknown depth %i bpp\n", avctx->bits_per_sample); return -1; } |