Commit 1d3eb0b5 authored by Andrew Kelley's avatar Andrew Kelley Committed by Martin Storsjö

oggenc: Move ogg_write_pages up above ogg_write_header

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 512f3ffe
...@@ -388,6 +388,28 @@ static int ogg_build_opus_headers(AVCodecContext *avctx, ...@@ -388,6 +388,28 @@ static int ogg_build_opus_headers(AVCodecContext *avctx,
return 0; return 0;
} }
static void ogg_write_pages(AVFormatContext *s, int flush)
{
OGGContext *ogg = s->priv_data;
OGGPageList *next, *p;
if (!ogg->page_list)
return;
for (p = ogg->page_list; p; ) {
OGGStreamContext *oggstream =
s->streams[p->page.stream_index]->priv_data;
if (oggstream->page_count < 2 && !flush)
break;
ogg_write_page(s, &p->page,
flush && oggstream->page_count == 1 ? 4 : 0); // eos
next = p->next;
av_freep(&p);
p = next;
}
ogg->page_list = p;
}
static int ogg_write_header(AVFormatContext *s) static int ogg_write_header(AVFormatContext *s)
{ {
OGGContext *ogg = s->priv_data; OGGContext *ogg = s->priv_data;
...@@ -522,28 +544,6 @@ static int ogg_write_header(AVFormatContext *s) ...@@ -522,28 +544,6 @@ static int ogg_write_header(AVFormatContext *s)
return 0; return 0;
} }
static void ogg_write_pages(AVFormatContext *s, int flush)
{
OGGContext *ogg = s->priv_data;
OGGPageList *next, *p;
if (!ogg->page_list)
return;
for (p = ogg->page_list; p; ) {
OGGStreamContext *oggstream =
s->streams[p->page.stream_index]->priv_data;
if (oggstream->page_count < 2 && !flush)
break;
ogg_write_page(s, &p->page,
flush && oggstream->page_count == 1 ? 4 : 0); // eos
next = p->next;
av_freep(&p);
p = next;
}
ogg->page_list = p;
}
static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt) static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
AVStream *st = s->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment