Browse Source

avformat/oggenc: Check segments_count for headers too

Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 81a8701eb5)
tags/n2.4.12
Michael Niedermayer Carl Eugen Hoyos 10 years ago
parent
commit
18f36c70ec
1 changed files with 7 additions and 4 deletions
  1. +7
    -4
      libavformat/oggenc.c

+ 7
- 4
libavformat/oggenc.c View File

@@ -257,7 +257,7 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st,
if (i == total_segments)
page->granule = granule;

if (!header) {
{
AVStream *st = s->streams[page->stream_index];

int64_t start = av_rescale_q(page->start_granule, st->time_base,
@@ -265,10 +265,13 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st,
int64_t next = av_rescale_q(page->granule, st->time_base,
AV_TIME_BASE_Q);

if (page->segments_count == 255 ||
(ogg->pref_size > 0 && page->size >= ogg->pref_size) ||
(ogg->pref_duration > 0 && next - start >= ogg->pref_duration)) {
if (page->segments_count == 255) {
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);
}
}
}
}


Loading…
Cancel
Save