Mercurial > libavcodec.hg

changeset 2802:4db6127e20b8 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reset restart_count when restart_interval is set and fill the MJpegDecodeContext with 0 on init.
author reimar
date Fri, 22 Jul 2005 08:48:00 +0000
parents 747f816cee69
children 26970df644f1
files mjpeg.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mjpeg.c	Tue Jul 19 14:25:23 2005 +0000
+++ b/mjpeg.c	Fri Jul 22 08:48:00 2005 +0000
@@ -882,6 +882,7 @@
 {
     MJpegDecodeContext *s = avctx->priv_data;
     MpegEncContext s2;
+    memset(s, 0, sizeof(MJpegDecodeContext));
 
     s->avctx = avctx;
 
@@ -1573,6 +1574,7 @@
     if (get_bits(&s->gb, 16) != 4)
 	return -1;
     s->restart_interval = get_bits(&s->gb, 16);
+    s->restart_count = 0;
     dprintf("restart interval: %d\n", s->restart_interval);
 
     return 0;
@@ -1892,6 +1894,7 @@
                 switch(start_code) {
                 case SOI:
 		    s->restart_interval = 0;
+		    s->restart_count = 0;
                     /* nothing to do on SOI */
                     break;
                 case DQT:
@@ -2000,6 +2003,7 @@
 read_header:
     /* reset on every SOI */
     s->restart_interval = 0;
+    s->restart_count = 0;
     s->mjpb_skiptosod = 0;
 
     init_get_bits(&hgb, buf_ptr, /*buf_size*/(buf_end - buf_ptr)*8);