From 7dba055bb0d31b2c79d9c3a66abb849a71417d3c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 28 May 2014 10:27:40 -0700 Subject: oggenc: Fix the EOS flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This corrects the bug that caused the checksums to change in 9767d7c092c890ecc5953452e8a951fd902dd67b. It caused the EOS flag to be set incorrectly; the ogg spec does not allow it to be set in the middle of a logical bitstream. Signed-off-by: Andrew Kelley Signed-off-by: Martin Storsjö --- libavformat/oggenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/oggenc.c') diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 97aba34a69..c30315a920 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -401,7 +401,7 @@ static void ogg_write_pages(AVFormatContext *s, int flush) if (oggstream->page_count < 2 && !flush) break; ogg_write_page(s, &p->page, - flush && oggstream->page_count == 1 ? 4 : 0); // eos + flush == 1 && oggstream->page_count == 1 ? 4 : 0); // eos next = p->next; av_freep(&p); p = next; @@ -540,7 +540,7 @@ static int ogg_write_header(AVFormatContext *s) oggstream->page.start_granule = AV_NOPTS_VALUE; - ogg_write_pages(s, 1); + ogg_write_pages(s, 2); return 0; } -- cgit v1.2.3