Commit 81a8701e authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/oggenc: Check segments_count for headers too

Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent da0e7695
...@@ -260,7 +260,7 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st, ...@@ -260,7 +260,7 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st,
if (i == total_segments) if (i == total_segments)
page->granule = granule; page->granule = granule;
if (!header) { {
AVStream *st = s->streams[page->stream_index]; AVStream *st = s->streams[page->stream_index];
int64_t start = av_rescale_q(page->start_granule, st->time_base, int64_t start = av_rescale_q(page->start_granule, st->time_base,
...@@ -268,10 +268,13 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st, ...@@ -268,10 +268,13 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st,
int64_t next = av_rescale_q(page->granule, st->time_base, int64_t next = av_rescale_q(page->granule, st->time_base,
AV_TIME_BASE_Q); AV_TIME_BASE_Q);
if (page->segments_count == 255 || if (page->segments_count == 255) {
(ogg->pref_size > 0 && page->size >= ogg->pref_size) ||
(ogg->pref_duration > 0 && next - start >= ogg->pref_duration)) {
ogg_buffer_page(s, oggstream); ogg_buffer_page(s, oggstream);
} else if (!header) {
if ((ogg->pref_size > 0 && page->size >= ogg->pref_size) ||
(ogg->pref_duration > 0 && next - start >= ogg->pref_duration)) {
ogg_buffer_page(s, oggstream);
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment