diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 17:16:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-16 20:46:59 +0100 |
| commit | f35f50b311a7224602ee2112238188185087465a (patch) | |
| tree | bb57e6cc534037879415368cb8c67c0d581855ee /libavcodec/cinepak.c | |
| parent | 111ffa55b7e6e7a4fcee5b93e4e416b75f704fb4 (diff) | |
| download | android_external_ffmpeg-f35f50b311a7224602ee2112238188185087465a.tar.gz android_external_ffmpeg-f35f50b311a7224602ee2112238188185087465a.tar.bz2 android_external_ffmpeg-f35f50b311a7224602ee2112238188185087465a.zip | |
cinepak, simplify, use AV_RB24()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cinepak.c')
| -rw-r--r-- | libavcodec/cinepak.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 68ffe5c687..6a8f46202f 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) { |