generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/oggenc: fix EOS flag

Browse Source 
This corrects the bug that caused the checksums to change in
9767d7c092

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-28 01:06:26 +02:00
parent b5657516b2
commit 919c320f72
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/oggenc.c
View File

@@ -406,7 +406,7 @@ static void ogg_write_pages(AVFormatContext *s, int flush)
if (oggstream->page_count < 2 && !flush) if (oggstream->page_count < 2 && !flush)
break; break;
ogg_write_page(s, &p->page, 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; next = p->next;
av_freep(&p); av_freep(&p);
p = next; p = next;
@@ -550,7 +550,7 @@ static int ogg_write_header(AVFormatContext *s)
oggstream->page.start_granule = AV_NOPTS_VALUE; oggstream->page.start_granule = AV_NOPTS_VALUE;
ogg_write_pages(s, 1); ogg_write_pages(s, 2);
return 0; return 0;
} }

2
tests/ref/lavf-fate/ogg_vp3
View File

@@ -1,3 +1,3 @@
5eff938810d2cc166dfbbd6bba5e710c *./tests/data/lavf-fate/lavf.ogg 4bd51dac3194fa88ae33767c25b4b1e6 *./tests/data/lavf-fate/lavf.ogg
417621 ./tests/data/lavf-fate/lavf.ogg 417621 ./tests/data/lavf-fate/lavf.ogg
./tests/data/lavf-fate/lavf.ogg CRC=0x037e3e79 ./tests/data/lavf-fate/lavf.ogg CRC=0x037e3e79

2
tests/ref/lavf/ogg
View File

@@ -1,3 +1,3 @@
7802375589f2584d182d632c870951bc *./tests/data/lavf/lavf.ogg 81b9366cacb23644c2803585dced9996 *./tests/data/lavf/lavf.ogg
13516 ./tests/data/lavf/lavf.ogg 13516 ./tests/data/lavf/lavf.ogg
./tests/data/lavf/lavf.ogg CRC=0x3a1da17e ./tests/data/lavf/lavf.ogg CRC=0x3a1da17e