virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

cleanup

Browse Source 
Originally committed as revision 1173 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2002-11-06 11:59:17 +00:00
parent 81ada1ce9d
commit 218baf10f8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mjpeg.c
View File

@@ -470,11 +470,11 @@ void mjpeg_picture_header(MpegEncContext *s)
put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */ 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; 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; int align= (-(int)(buf))&3;
assert((size&7) == 0); assert((size&7) == 0);
@@ -533,7 +533,9 @@ void mjpeg_picture_trailer(MpegEncContext *s)
put_bits(&s->pb, pad,0xFF>>(8-pad)); put_bits(&s->pb, pad,0xFF>>(8-pad));
flush_put_bits(&s->pb); 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); put_marker(&s->pb, EOI);
} }