[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec cinepak.c,1.10,1.11

[Mike Melanson CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv25283/libavcodec

Modified Files:
	cinepak.c 
Log Message:
correctly handle very large Cinepak frames (courtesy of John Koleszar
<jkoleszar at on2.com>)


Index: cinepak.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/cinepak.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cinepak.c	14 Aug 2005 18:39:59 -0000	1.10
+++ cinepak.c	14 Dec 2005 00:19:01 -0000	1.11
@@ -325,7 +325,7 @@
 
     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)