diff options
author | Ben Boeckel <mathstuf@gmail.com> | 2014-02-05 21:10:54 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-06 01:36:42 +0400 |
commit | 7eb84f2c3b30e562e346204a13412c31a07e13ed (patch) | |
tree | 44602005e2da9291a6c6ad3ff8b04de43ab8ef5f /libavformat/oggdec.c | |
parent | 129e24f78e5dd2166211156346872ee92545b8a4 (diff) |
ogg: allow streams to update metadata
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggdec.c')
-rw-r--r-- | libavformat/oggdec.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index efb8f04a9c..66eb605b2f 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -78,6 +78,8 @@ static int ogg_save(AVFormatContext *s) struct ogg_stream *os = ogg->streams + i; os->buf = av_mallocz(os->bufsize + FF_INPUT_BUFFER_PADDING_SIZE); memcpy(os->buf, ost->streams[i].buf, os->bufpos); + os->new_metadata = NULL; + os->new_metadata_size = 0; } ogg->state = ost; @@ -144,6 +146,8 @@ static int ogg_reset(AVFormatContext *s) os->lastpts = 0; } os->end_trimming = 0; + av_freep(&os->new_metadata); + os->new_metadata_size = 0; } ogg->page_pos = -1; @@ -641,6 +645,7 @@ static int ogg_read_close(AVFormatContext *s) ogg->streams[i].codec->cleanup(s, i); } av_freep(&ogg->streams[i].private); + av_freep(&ogg->streams[i].new_metadata); } av_freep(&ogg->streams); return 0; @@ -789,6 +794,15 @@ retry: os->end_trimming = 0; } + if (os->new_metadata) { + uint8_t *side_data = av_packet_new_side_data(pkt, + AV_PKT_DATA_METADATA_UPDATE, + os->new_metadata_size); + memcpy(side_data, os->new_metadata, os->new_metadata_size); + av_freep(&os->new_metadata); + os->new_metadata_size = 0; + } + return psize; } |