[FFmpeg-cvslog] avformat/oggenc: Check segments_count for headers too
Michael Niedermayer
git at videolan.org
Fri Oct 9 22:01:28 CEST 2015
ffmpeg | branch: release/2.5 | Michael Niedermayer <michael at niedermayer.cc> | Thu Aug 27 04:08:42 2015 +0200| [1024bcab6272ef4656e46c432074228f5bf743a8] | committer: Carl Eugen Hoyos
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 at niedermayer.cc>
(cherry picked from commit 81a8701eb52d2b6469ae16ef442ce425388141b7)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1024bcab6272ef4656e46c432074228f5bf743a8
---
libavformat/oggenc.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index daec4ee..321bee8 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);
+ }
}
}
}
More information about the ffmpeg-cvslog
mailing list