aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorAndrew Kelley <superjoe30@gmail.com>2014-05-25 21:04:19 -0700
committerMartin Storsjö <martin@martin.st>2014-05-27 20:16:58 +0300
commit1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1 (patch)
tree04a2489e70a03a23ee33896239c0244631a3b9da /libavformat
parent512f3ffe9b4bb86767c2b1176554407c75fe1a5c (diff)
downloadffmpeg-1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1.tar.gz
oggenc: Move ogg_write_pages up above ogg_write_header
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/oggenc.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index c52368dde3..53a1e21605 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -388,6 +388,28 @@ static int ogg_build_opus_headers(AVCodecContext *avctx,
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)
{
OGGContext *ogg = s->priv_data;
@@ -522,28 +544,6 @@ static int ogg_write_header(AVFormatContext *s)
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)
{
AVStream *st = s->streams[pkt->stream_index];