[FFmpeg-cvslog] cinepak, simplify, use AV_RB24()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 16 17:16:38 2011 +0100| [d92fea2b1420aea1c1f3c2ececbd953f5f06f49b] | committer: Martin Storsjö

cinepak, simplify, use AV_RB24()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d92fea2b1420aea1c1f3c2ececbd953f5f06f49b
---

 libavcodec/cinepak.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index c6edfe6..e66a1c0 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) {