aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-02 21:46:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-02 21:46:24 +0200
commitd73371b58c3d5bea4f184927392913169f8ba943 (patch)
tree4f46b90c1d0ef857716e22262b4988cc728548e7
parent08b6591cf6d33363c5e8163ce60ebeaa76ed2e74 (diff)
downloadffmpeg-d73371b58c3d5bea4f184927392913169f8ba943.tar.gz
avcodec/mmvideo: remove unused return value and assignment
Found-by: CSA Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mmvideo.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index ab59b58781..026d4630ae 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -68,7 +68,7 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
return 0;
}
-static int mm_decode_pal(MmContext *s)
+static void mm_decode_pal(MmContext *s)
{
int i;
@@ -77,8 +77,6 @@ static int mm_decode_pal(MmContext *s)
s->palette[i] = 0xFFU << 24 | bytestream2_get_be24(&s->gb);
s->palette[i+128] = s->palette[i]<<2;
}
-
- return 0;
}
/**
@@ -200,7 +198,7 @@ static int mm_decode_frame(AVCodecContext *avctx,
return res;
switch(type) {
- case MM_TYPE_PALETTE : res = mm_decode_pal(s); return avpkt->size;
+ case MM_TYPE_PALETTE : mm_decode_pal(s); return avpkt->size;
case MM_TYPE_INTRA : res = mm_decode_intra(s, 0, 0); break;
case MM_TYPE_INTRA_HH : res = mm_decode_intra(s, 1, 0); break;
case MM_TYPE_INTRA_HHV : res = mm_decode_intra(s, 1, 1); break;