summaryrefslogtreecommitdiff
path: root/libavcodec/cinepak.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-16 17:16:38 +0100
committerMartin Storsjö <martin@martin.st>2011-11-18 11:58:42 +0200
commitd92fea2b1420aea1c1f3c2ececbd953f5f06f49b (patch)
treef81e87ff739fab481833e13fff22561c2eff9e64 /libavcodec/cinepak.c
parenta2b51fe87c49c3ce21c4ae3310be234a9f87795c (diff)
downloadffmpeg-d92fea2b1420aea1c1f3c2ececbd953f5f06f49b.tar.gz
cinepak, simplify, use AV_RB24()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/cinepak.c')
-rw-r--r--libavcodec/cinepak.c2
1 files changed, 1 insertions, 1 deletions
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) {