[SCM] libav/experimental: oggenc: Flush after writing headers

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:16 UTC 2014


The following commit has been merged in the experimental branch:
commit 9767d7c092c890ecc5953452e8a951fd902dd67b
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sun May 25 21:04:19 2014 -0700

    oggenc: Flush after writing headers
    
    Before, header information for ogg format files was sent with the
    first encoded packet.
    
    This patch makes it so that it is possible for API users to
    differentiate between headers and encoded audio. This is useful, for
    example, when creating an audio stream where you want to send one set
    of headers for every client that connects and then the encoded stream
    of audio.
    
    Signed-off-by: Martin Storsjö <martin at martin.st>

diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 53a1e21..e082a7e 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -541,6 +541,8 @@ static int ogg_write_header(AVFormatContext *s)
 
     oggstream->page.start_granule = AV_NOPTS_VALUE;
 
+    ogg_write_pages(s, 1);
+
     return 0;
 }
 
diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg
index ea827ac..ca62b26 100644
--- a/tests/ref/lavf/ogg
+++ b/tests/ref/lavf/ogg
@@ -1,3 +1,3 @@
-8ca901bc8d24b80ebe79e387e454d1e9 *./tests/data/lavf/lavf.ogg
+3c41e917d95f925eaa8f2e31972edcfa *./tests/data/lavf/lavf.ogg
 13476 ./tests/data/lavf/lavf.ogg
 ./tests/data/lavf/lavf.ogg CRC=0x3a1da17e

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list