Mercurial > libavcodec.hg

changeset 9750:a87706453840 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of extradata casts, it already has the right uint8_t * type
author reimar
date Sun, 31 May 2009 09:12:17 +0000
parents 4a4192578b60
children 705efd6ddaab
files lcldec.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lcldec.c	Sun May 31 09:09:32 2009 +0000
+++ b/lcldec.c	Sun May 31 09:12:17 2009 +0000
@@ -485,13 +485,13 @@
     }
 
     /* Check codec type */
-    if ((avctx->codec_id == CODEC_ID_MSZH  && *((char *)avctx->extradata + 7) != CODEC_MSZH) ||
-        (avctx->codec_id == CODEC_ID_ZLIB  && *((char *)avctx->extradata + 7) != CODEC_ZLIB)) {
+    if ((avctx->codec_id == CODEC_ID_MSZH  && avctx->extradata[7] != CODEC_MSZH) ||
+        (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");
     }
 
     /* Detect image type */
-    switch (c->imgtype = *((char *)avctx->extradata + 4)) {
+    switch (c->imgtype = avctx->extradata[4]) {
     case IMGTYPE_YUV111:
         c->decomp_size = basesize * 3;
         max_decomp_size = max_basesize * 3;
@@ -534,7 +534,7 @@
     }
 
     /* Detect compression method */
-    c->compression = *((char *)avctx->extradata + 5);
+    c->compression = avctx->extradata[5];
     switch (avctx->codec_id) {
     case CODEC_ID_MSZH:
         switch (c->compression) {
@@ -588,7 +588,7 @@
     }
 
     /* Detect flags */
-    c->flags = *((char *)avctx->extradata + 6);
+    c->flags = avctx->extradata[6];
     if (c->flags & FLAG_MULTITHREAD)
         av_log(avctx, AV_LOG_INFO, "Multithread encoder flag set.\n");
     if (c->flags & FLAG_NULLFRAME)