Mercurial > libavcodec.hg

changeset 2799:924c7e66ced8 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dont pre allocate uselessly large buffer and dont ignore FF_INPUT_BUFFER_PADDING_SIZE
author michael
date Sun, 17 Jul 2005 12:56:56 +0000
parents eb488002ab4a
children bf5c4e9dc75a
files mjpeg.c
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mjpeg.c	Sun Jul 17 11:27:00 2005 +0000
+++ b/mjpeg.c	Sun Jul 17 12:56:56 2005 +0000
@@ -896,11 +896,8 @@
     s->idct_put= s2.dsp.idct_put;
 
     s->mpeg_enc_ctx_allocated = 0;
-    s->buffer_size = 102400; /* smaller buffer should be enough,
-				but photojpg files could ahive bigger sizes */
-    s->buffer = av_malloc(s->buffer_size);
-    if (!s->buffer)
-	return -1;
+    s->buffer_size = 0;
+    s->buffer = NULL;
     s->start_code = -1;
     s->first_picture = 1;
     s->org_height = avctx->coded_height;
@@ -1841,7 +1838,7 @@
 		{
 		    av_free(s->buffer);
 		    s->buffer_size = buf_end-buf_ptr;
-		    s->buffer = av_malloc(s->buffer_size);
+                    s->buffer = av_malloc(s->buffer_size + FF_INPUT_BUFFER_PADDING_SIZE);
 		    dprintf("buffer too small, expanding to %d bytes\n",
 			s->buffer_size);
 		}