diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-12-14 00:19:01 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-12-14 00:19:01 +0000 |
| commit | 0c3ee78f91486919acee57e9f6220dd4e2b611c9 (patch) | |
| tree | 0652f99ac5d10e6db38ae610cd6137c7d2949b3b /libavcodec/cinepak.c | |
| parent | 86f77a493a629bc9a646cb6cbdb874674f7bbeb4 (diff) | |
| download | ffmpeg-streaming-0c3ee78f91486919acee57e9f6220dd4e2b611c9.zip ffmpeg-streaming-0c3ee78f91486919acee57e9f6220dd4e2b611c9.tar.gz | |
correctly handle very large Cinepak frames (courtesy of John Koleszar
<jkoleszar@on2.com>)
Originally committed as revision 4742 to svn://svn.ffmpeg.org/ffmpeg/trunk
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 d1e1f0e..6da011f 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -325,7 +325,7 @@ static int cinepak_decode (CinepakContext *s) frame_flags = s->data[0]; num_strips = BE_16 (&s->data[8]); - encoded_buf_size = BE_16 (&s->data[2]); + encoded_buf_size = ((s->data[1] << 16) | BE_16 (&s->data[2])); if (encoded_buf_size != s->size) sega_film_data = 1; if (sega_film_data) |
