virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

oggenc: Write stream metadata if available

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
James Almer
2013-07-18 04:18:24 -03:00
committed by Michael Niedermayer
parent 7651c0e49b
commit ac8e70d735
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/oggenc.c
View File

@@ -447,11 +447,13 @@ static int ogg_write_header(AVFormatContext *s)
} while (j < i); } while (j < i);
oggstream->serial_num = serial_num; oggstream->serial_num = serial_num;
av_dict_copy(&st->metadata, s->metadata, AV_DICT_DONT_OVERWRITE);
st->priv_data = oggstream; st->priv_data = oggstream;
if (st->codec->codec_id == AV_CODEC_ID_FLAC) { if (st->codec->codec_id == AV_CODEC_ID_FLAC) {
int err = ogg_build_flac_headers(st->codec, oggstream, int err = ogg_build_flac_headers(st->codec, oggstream,
st->codec->flags & CODEC_FLAG_BITEXACT, st->codec->flags & CODEC_FLAG_BITEXACT,
&s->metadata); &st->metadata);
if (err) { if (err) {
av_log(s, AV_LOG_ERROR, "Error writing FLAC headers\n"); av_log(s, AV_LOG_ERROR, "Error writing FLAC headers\n");
av_freep(&st->priv_data); av_freep(&st->priv_data);
@@ -460,7 +462,7 @@ static int ogg_write_header(AVFormatContext *s)
} else if (st->codec->codec_id == AV_CODEC_ID_SPEEX) { } else if (st->codec->codec_id == AV_CODEC_ID_SPEEX) {
int err = ogg_build_speex_headers(st->codec, oggstream, int err = ogg_build_speex_headers(st->codec, oggstream,
st->codec->flags & CODEC_FLAG_BITEXACT, st->codec->flags & CODEC_FLAG_BITEXACT,
&s->metadata); &st->metadata);
if (err) { if (err) {
av_log(s, AV_LOG_ERROR, "Error writing Speex headers\n"); av_log(s, AV_LOG_ERROR, "Error writing Speex headers\n");
av_freep(&st->priv_data); av_freep(&st->priv_data);
@@ -469,7 +471,7 @@ static int ogg_write_header(AVFormatContext *s)
} else if (st->codec->codec_id == AV_CODEC_ID_OPUS) { } else if (st->codec->codec_id == AV_CODEC_ID_OPUS) {
int err = ogg_build_opus_headers(st->codec, oggstream, int err = ogg_build_opus_headers(st->codec, oggstream,
st->codec->flags & CODEC_FLAG_BITEXACT, st->codec->flags & CODEC_FLAG_BITEXACT,
&s->metadata); &st->metadata);
if (err) { if (err) {
av_log(s, AV_LOG_ERROR, "Error writing Opus headers\n"); av_log(s, AV_LOG_ERROR, "Error writing Opus headers\n");
av_freep(&st->priv_data); av_freep(&st->priv_data);
@@ -490,7 +492,7 @@ static int ogg_write_header(AVFormatContext *s)
} }
p = ogg_write_vorbiscomment(7, st->codec->flags & CODEC_FLAG_BITEXACT, p = ogg_write_vorbiscomment(7, st->codec->flags & CODEC_FLAG_BITEXACT,
&oggstream->header_len[1], &s->metadata, &oggstream->header_len[1], &st->metadata,
framing_bit); framing_bit);
oggstream->header[1] = p; oggstream->header[1] = p;
if (!p) if (!p)