diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-27 04:08:42 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-09 22:10:29 +0200 |
| commit | 18f36c70ec7a61140f92fdaf637e09cdcd2f4c8b (patch) | |
| tree | f073a22961ffa70ab92f1ac477677b4e085d2244 | |
| parent | 6b4a22b5e9b37d8631d1e5af13ec687fa842622a (diff) | |
| download | ffmpeg-18f36c70ec7a61140f92fdaf637e09cdcd2f4c8b.tar.gz | |
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 81a8701eb52d2b6469ae16ef442ce425388141b7)
| -rw-r--r-- | libavformat/oggenc.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index bfa9a25edc..e87cbba231 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -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); + } } } } |