From fbe8c56dfeb531d815dec1419624bb1c60739100 Mon Sep 17 00:00:00 2001 From: Greg Maxwell Date: Mon, 15 Mar 2010 23:04:09 +0000 Subject: Correctly write last 0 lacing value when packet size is multiple of 255, patch by Greg Maxwell, gmaxwell at gmail dot com Originally committed as revision 22559 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/oggenc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libavformat/oggenc.c') diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 101570b177..bdf474e334 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -61,7 +61,7 @@ static int ogg_write_page(AVFormatContext *s, const uint8_t *data, int size, } else if (oggstream->eos) flags |= 4; - page_segments = FFMIN((size/255)+!!size, 255); + page_segments = FFMIN(size/255 + 1, 255); init_checksum(s->pb, ff_crc04C11DB7_update, 0); put_tag(s->pb, "OggS"); @@ -75,10 +75,9 @@ static int ogg_write_page(AVFormatContext *s, const uint8_t *data, int size, put_byte(s->pb, page_segments); for (i = 0; i < page_segments-1; i++) put_byte(s->pb, 255); - if (size) { - put_byte(s->pb, size - (page_segments-1)*255); - put_buffer(s->pb, data, size); - } + put_byte(s->pb, size - (page_segments-1)*255); + put_buffer(s->pb, data, size); + ogg_update_checksum(s, crc_offset); put_flush_packet(s->pb); return size; -- cgit v1.2.3