Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Get rid of extradata casts, it already has the right uint8_t * type

Browse Source 
Originally committed as revision 19034 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Reimar Döffinger 16 years ago
parent 8c18e490c4
commit 445e0ab539
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      libavcodec/lcldec.c

10
libavcodec/lcldec.c
Unescape View File

@ -485,13 +485,13 @@ static av_cold int decode_init(AVCodecContext *avctx)
} }
/* Check codec type */ /* Check codec type */
if ((avctx->codec_id == CODEC_ID_MSZH && *((char *)avctx->extradata + 7) != CODEC_MSZH) || if ((avctx->codec_id == CODEC_ID_MSZH && avctx->extradata[7] != CODEC_MSZH) ||
(avctx->codec_id == CODEC_ID_ZLIB && *((char *)avctx->extradata + 7) != CODEC_ZLIB)) { (avctx->codec_id == CODEC_ID_ZLIB && avctx->extradata[7] != CODEC_ZLIB)) {
av_log(avctx, AV_LOG_ERROR, "Codec id and codec type mismatch. This should not happen.\n"); av_log(avctx, AV_LOG_ERROR, "Codec id and codec type mismatch. This should not happen.\n");
} }
/* Detect image type */ /* Detect image type */
switch (c->imgtype = *((char *)avctx->extradata + 4)) { switch (c->imgtype = avctx->extradata[4]) {
case IMGTYPE_YUV111: case IMGTYPE_YUV111:
c->decomp_size = basesize * 3; c->decomp_size = basesize * 3;
max_decomp_size = max_basesize * 3; max_decomp_size = max_basesize * 3;
@ -534,7 +534,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
} }
/* Detect compression method */ /* Detect compression method */
c->compression = *((char *)avctx->extradata + 5); c->compression = avctx->extradata[5];
switch (avctx->codec_id) { switch (avctx->codec_id) {
case CODEC_ID_MSZH: case CODEC_ID_MSZH:
switch (c->compression) { switch (c->compression) {
@ -588,7 +588,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
} }
/* Detect flags */ /* Detect flags */
c->flags = *((char *)avctx->extradata + 6); c->flags = avctx->extradata[6];
if (c->flags & FLAG_MULTITHREAD) if (c->flags & FLAG_MULTITHREAD)
av_log(avctx, AV_LOG_INFO, "Multithread encoder flag set.\n"); av_log(avctx, AV_LOG_INFO, "Multithread encoder flag set.\n");
if (c->flags & FLAG_NULLFRAME) if (c->flags & FLAG_NULLFRAME)

Write Preview
Loading…
Cancel
Save