mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 16:52:31 +00:00
Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b'
* commit '9767d7c092c890ecc5953452e8a951fd902dd67b': oggenc: Flush after writing headers Conflicts: tests/ref/lavf/ogg Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b5657516b2
@ -550,6 +550,8 @@ static int ogg_write_header(AVFormatContext *s)
|
||||
|
||||
oggstream->page.start_granule = AV_NOPTS_VALUE;
|
||||
|
||||
ogg_write_pages(s, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
4bd51dac3194fa88ae33767c25b4b1e6 *./tests/data/lavf-fate/lavf.ogg
|
||||
5eff938810d2cc166dfbbd6bba5e710c *./tests/data/lavf-fate/lavf.ogg
|
||||
417621 ./tests/data/lavf-fate/lavf.ogg
|
||||
./tests/data/lavf-fate/lavf.ogg CRC=0x037e3e79
|
||||
|
@ -1,3 +1,3 @@
|
||||
81b9366cacb23644c2803585dced9996 *./tests/data/lavf/lavf.ogg
|
||||
7802375589f2584d182d632c870951bc *./tests/data/lavf/lavf.ogg
|
||||
13516 ./tests/data/lavf/lavf.ogg
|
||||
./tests/data/lavf/lavf.ogg CRC=0x3a1da17e
|
||||
|
Loading…
Reference in New Issue
Block a user