[FFmpeg-devel] [PATCH 2/4] cinepack, simplify, use AV_RB24()

Michael Niedermayer michaelni at gmx.at
Wed Nov 16 17:43:53 CET 2011


Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavcodec/cinepak.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 68ffe5c..6a8f462 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) {
-- 
1.7.4.1



More information about the ffmpeg-devel mailing list