[FFmpeg-cvslog] oggenc: Move ogg_write_pages up above ogg_write_header
Andrew Kelley
git at videolan.org
Wed May 28 00:36:12 CEST 2014
ffmpeg | branch: master | Andrew Kelley <superjoe30 at gmail.com> | Sun May 25 21:04:19 2014 -0700| [1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1] | committer: Martin Storsjö
oggenc: Move ogg_write_pages up above ogg_write_header
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1
---
libavformat/oggenc.c | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index c52368d..53a1e21 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];
More information about the ffmpeg-cvslog
mailing list