From d92fea2b1420aea1c1f3c2ececbd953f5f06f49b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 16 Nov 2011 17:16:38 +0100 Subject: cinepak, simplify, use AV_RB24() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Niedermayer Signed-off-by: Martin Storsjö --- libavcodec/cinepak.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/cinepak.c') diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index c6edfe6cc9..e66a1c05a2 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -326,7 +326,7 @@ static int cinepak_decode (CinepakContext *s) frame_flags = s->data[0]; num_strips = AV_RB16 (&s->data[8]); - encoded_buf_size = ((s->data[1] << 16) | AV_RB16 (&s->data[2])); + encoded_buf_size = AV_RB24(&s->data[1]); /* if this is the first frame, check for deviant Sega FILM data */ if (s->sega_film_skip_bytes == -1) { -- cgit v1.2.3