RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-08 10:13:10 +00:00
Code Issues Projects Releases Wiki Activity

huffyuv: Eliminate some pointless casts

Browse Source
This commit is contained in:
Diego Biurrun 2014-08-03 10:57:01 -07:00
parent c065f4a0c6
commit b7616f5716
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/huffyuvdec.c
View File

@ -263,17 +263,17 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (avctx->extradata_size < 4) if (avctx->extradata_size < 4)
return -1; return -1;
method = ((uint8_t *) avctx->extradata)[0]; method = avctx->extradata[0];
s->decorrelate = method & 64 ? 1 : 0; s->decorrelate = method & 64 ? 1 : 0;
s->predictor = method & 63; s->predictor = method & 63;
s->bitstream_bpp = ((uint8_t *) avctx->extradata)[1]; s->bitstream_bpp = avctx->extradata[1];
if (s->bitstream_bpp == 0) if (s->bitstream_bpp == 0)
s->bitstream_bpp = avctx->bits_per_coded_sample & ~7; 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->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) avctx->extradata_size - 4) < 0)
return -1; return -1;
} else { } else {
@ -343,7 +343,7 @@ static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
s->vlc[i].table = NULL; s->vlc[i].table = NULL;
if (s->version == 2) { 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) avctx->extradata_size) < 0)
return -1; return -1;
} else { } else {