aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2014-01-09 12:11:26 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2014-01-09 16:09:41 -0500
commitaa69cbc9e08281db6ecb98a2c8b4f60e8b12e558 (patch)
tree0ab382d909e429fd0cdebbd419369ea9aa7d6c33 /libavformat
parente6f0bb65270be51ea43345a28f8e4b1a728f7d0e (diff)
downloadffmpeg-aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558.tar.gz
flac muxer: add option to disable writing the global header
The global header is not explicitly required for playback, and omitting it allows for simple concatenation.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/flacenc.c28
-rw-r--r--libavformat/version.h2
2 files changed, 29 insertions, 1 deletions
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
index 1e4042e070..83ddf441e0 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 {
+ const AVClass *class;
+ int write_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->write_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->write_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[] = {
+ { "write_header", "Write the file header", offsetof(FlacMuxerContext, write_header), AV_OPT_TYPE_INT, {.i64 = 1}, 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,
};
diff --git a/libavformat/version.h b/libavformat/version.h
index a170c06358..676842688a 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 10
-#define LIBAVFORMAT_VERSION_MICRO 1
+#define LIBAVFORMAT_VERSION_MICRO 2
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \