The global header is not explicitly required for playback, and
omitting it allows for simple concatenation.
---
libavformat/flacenc.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
index 1e4042e..e219cc6 100644
--- a/libavformat/flacenc.c
+++ b/libavformat/flacenc.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/opt.h"
#include "libavcodec/flac.h"
#include "avformat.h"
#include "flacenc.h"
@@ -26,6 +27,11 @@
#include "libavcodec/bytestream.h"
+typedef struct FlacMuxerContext {
+ AVClass *class;
+ int no_header;
+} FlacMuxerContext;
+
static int flac_write_block_padding(AVIOContext *pb, unsigned int
n_padding_bytes,
int last_block)
{
@@ -68,6 +74,10 @@ static int flac_write_header(struct AVFormatContext *s)
{
int ret;
AVCodecContext *codec = s->streams[0]->codec;
+ FlacMuxerContext *c = s->priv_data;
+
+ if (c->no_header)
+ return 0;
ret = ff_flac_write_header(s->pb, codec, 0);
if (ret)
@@ -93,6 +103,10 @@ static int flac_write_trailer(struct AVFormatContext *s)
uint8_t *streaminfo;
enum FLACExtradataFormat format;
int64_t file_size;
+ FlacMuxerContext *c = s->priv_data;
+
+ if (c->no_header)
+ return 0;
if (!avpriv_flac_is_extradata_valid(s->streams[0]->codec, &format,
&streaminfo))
return -1;
@@ -116,9 +130,22 @@ static int flac_write_packet(struct AVFormatContext *s,
AVPacket *pkt)
return 0;
}
+static const AVOption flacenc_options[] = {
+ { "no_header", "Disable writing the file header",
offsetof(FlacMuxerContext, no_header), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1,
AV_OPT_FLAG_ENCODING_PARAM },
+ { NULL },
+};
+
+static const AVClass flac_muxer_class = {
+ .class_name = "flac muxer",
+ .item_name = av_default_item_name,
+ .option = flacenc_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
AVOutputFormat ff_flac_muxer = {
.name = "flac",
.long_name = NULL_IF_CONFIG_SMALL("raw FLAC"),
+ .priv_data_size = sizeof(FlacMuxerContext),
.mime_type = "audio/x-flac",
.extensions = "flac",
.audio_codec = AV_CODEC_ID_FLAC,
@@ -127,4 +154,5 @@ AVOutputFormat ff_flac_muxer = {
.write_packet = flac_write_packet,
.write_trailer = flac_write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
+ .priv_class = &flac_muxer_class,
};
--
1.8.1.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
