[SCM] libav/experimental: huffyuv: Eliminate some pointless casts
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:04:10 UTC 2014
The following commit has been merged in the experimental branch:
commit b7616f5716dce68c749d5dfeab19cf595a11807c
Author: Diego Biurrun <diego at biurrun.de>
Date: Sun Aug 3 10:57:01 2014 -0700
huffyuv: Eliminate some pointless casts
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index e57b461..b2fc3aa 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -263,17 +263,17 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (avctx->extradata_size < 4)
return -1;
- method = ((uint8_t *) avctx->extradata)[0];
+ method = avctx->extradata[0];
s->decorrelate = method & 64 ? 1 : 0;
s->predictor = method & 63;
- s->bitstream_bpp = ((uint8_t *) avctx->extradata)[1];
+ s->bitstream_bpp = avctx->extradata[1];
if (s->bitstream_bpp == 0)
s->bitstream_bpp = avctx->bits_per_coded_sample & ~7;
- interlace = (((uint8_t *) avctx->extradata)[2] & 0x30) >> 4;
+ interlace = (avctx->extradata[2] & 0x30) >> 4;
s->interlaced = (interlace == 1) ? 1 : (interlace == 2) ? 0 : s->interlaced;
- s->context = ((uint8_t *) avctx->extradata)[2] & 0x40 ? 1 : 0;
+ s->context = avctx->extradata[2] & 0x40 ? 1 : 0;
- if (read_huffman_tables(s, ((uint8_t *) avctx->extradata) + 4,
+ if (read_huffman_tables(s, avctx->extradata + 4,
avctx->extradata_size - 4) < 0)
return -1;
} else {
@@ -343,7 +343,7 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
s->vlc[i].table = NULL;
if (s->version == 2) {
- if (read_huffman_tables(s, ((uint8_t *) avctx->extradata) + 4,
+ if (read_huffman_tables(s, avctx->extradata + 4,
avctx->extradata_size) < 0)
return -1;
} else {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list