diff options
| author | David Conrad <lessen42@gmail.com> | 2007-09-05 00:24:08 +0000 |
|---|---|---|
| committer | David Conrad <lessen42@gmail.com> | 2007-09-05 00:24:08 +0000 |
| commit | 8a39497c13f0ae8d132359f346e5b6e01f54b060 (patch) | |
| tree | 3d68f777b899192d0dbd271e40b9ef71638442a0 /libavformat/matroskaenc.c | |
| parent | 86be66378b2ba2181e9efbc8c6d27e311f3a9263 (diff) | |
| download | ffmpeg-8a39497c13f0ae8d132359f346e5b6e01f54b060.tar.gz | |
Write FLAC codec private correctly
Originally committed as revision 10339 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3ccecb110c..8acda3818f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -364,6 +364,28 @@ static int put_xiph_codecpriv(ByteIOContext *pb, AVCodecContext *codec) return 0; } +#define FLAC_STREAMINFO_SIZE 34 + +static int put_flac_codecpriv(ByteIOContext *pb, AVCodecContext *codec) +{ + offset_t codecpriv = start_ebml_master(pb, MATROSKA_ID_CODECPRIVATE); + + // if the extradata_size is greater than FLAC_STREAMINFO_SIZE, + // assume that it's in Matroska's format already + if (codec->extradata_size < FLAC_STREAMINFO_SIZE) { + av_log(codec, AV_LOG_ERROR, "Invalid FLAC extradata\n"); + return -1; + } else if (codec->extradata_size == FLAC_STREAMINFO_SIZE) { + // only the streaminfo packet + put_byte(pb, 0); + put_xiph_size(pb, codec->extradata_size); + av_log(codec, AV_LOG_ERROR, "Only one packet\n"); + } + put_buffer(pb, codec->extradata, codec->extradata_size); + end_ebml_master(pb, codecpriv); + return 0; +} + static void get_aac_sample_rates(AVCodecContext *codec, int *sample_rate, int *output_sample_rate) { static const int aac_sample_rates[] = { @@ -440,6 +462,9 @@ static int mkv_write_tracks(AVFormatContext *s) if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) { if (put_xiph_codecpriv(pb, codec) < 0) return -1; + } else if (codec->codec_id == CODEC_ID_FLAC) { + if (put_flac_codecpriv(pb, codec) < 0) + return -1; } else if (codec->extradata_size) { put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codec->extradata, codec->extradata_size); } |