Mercurial > libavcodec.hg
diff mjpeg.c @ 841:4033915880d9 libavcodec
cleanup
author | michaelni |
---|---|
date | Wed, 06 Nov 2002 11:59:17 +0000 |
parents | 4c22dcf3ba65 |
children | d326091dae9f |
line wrap: on
line diff
--- a/mjpeg.c Wed Nov 06 09:30:47 2002 +0000 +++ b/mjpeg.c Wed Nov 06 11:59:17 2002 +0000 @@ -470,11 +470,11 @@ put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */ } -static void escape_FF(MpegEncContext *s) +static void escape_FF(MpegEncContext *s, int start) { - int size= get_bit_count(&s->pb) - s->header_bits; + int size= get_bit_count(&s->pb) - start*8; int i, ff_count; - uint8_t *buf= s->pb.buf + (s->header_bits>>3); + uint8_t *buf= s->pb.buf + start; int align= (-(int)(buf))&3; assert((size&7) == 0); @@ -533,7 +533,9 @@ put_bits(&s->pb, pad,0xFF>>(8-pad)); flush_put_bits(&s->pb); - escape_FF(s); + assert((s->header_bits&7)==0); + + escape_FF(s, s->header_bits>>3); put_marker(&s->pb, EOI); }