diff options
| -rw-r--r-- | libavformat/flacenc.c | 6 | ||||
| -rw-r--r-- | libavformat/oggenc.c | 14 | ||||
| -rw-r--r-- | libavformat/vorbiscomment.c | 6 | ||||
| -rw-r--r-- | libavformat/vorbiscomment.h | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index 91a080f3a3..ccf83294ec 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -39,14 +39,14 @@ static int flac_write_block_padding(ByteIOContext *pb, unsigned int n_padding_by return 0; } -static int flac_write_block_comment(ByteIOContext *pb, AVMetadata *m, +static int flac_write_block_comment(ByteIOContext *pb, AVMetadata **m, int last_block, int bitexact) { const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT; unsigned int len, count; uint8_t *p, *p0; - len = ff_vorbiscomment_length(m, vendor, &count); + len = ff_vorbiscomment_length(*m, vendor, &count); p0 = av_malloc(len+4); if (!p0) return AVERROR(ENOMEM); @@ -72,7 +72,7 @@ static int flac_write_header(struct AVFormatContext *s) if (ret) return ret; - ret = flac_write_block_comment(s->pb, s->metadata, 0, + ret = flac_write_block_comment(s->pb, &s->metadata, 0, codec->flags & CODEC_FLAG_BITEXACT); if (ret) return ret; diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 3d9a44be24..b71e96a9d7 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -206,14 +206,14 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st, } static uint8_t *ogg_write_vorbiscomment(int offset, int bitexact, - int *header_len, AVMetadata *m, int framing_bit) + int *header_len, AVMetadata **m, int framing_bit) { const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT; int size; uint8_t *p, *p0; unsigned int count; - size = offset + ff_vorbiscomment_length(m, vendor, &count) + framing_bit; + size = offset + ff_vorbiscomment_length(*m, vendor, &count) + framing_bit; p = av_mallocz(size); if (!p) return NULL; @@ -230,7 +230,7 @@ static uint8_t *ogg_write_vorbiscomment(int offset, int bitexact, static int ogg_build_flac_headers(AVCodecContext *avctx, OGGStreamContext *oggstream, int bitexact, - AVMetadata *m) + AVMetadata **m) { enum FLACExtradataFormat format; uint8_t *streaminfo; @@ -270,7 +270,7 @@ static int ogg_build_flac_headers(AVCodecContext *avctx, static int ogg_build_speex_headers(AVCodecContext *avctx, OGGStreamContext *oggstream, int bitexact, - AVMetadata *m) + AVMetadata **m) { uint8_t *p; @@ -338,7 +338,7 @@ static int ogg_write_header(AVFormatContext *s) if (st->codec->codec_id == CODEC_ID_FLAC) { int err = ogg_build_flac_headers(st->codec, oggstream, st->codec->flags & CODEC_FLAG_BITEXACT, - s->metadata); + &s->metadata); if (err) { av_log(s, AV_LOG_ERROR, "Error writing FLAC headers\n"); av_freep(&st->priv_data); @@ -347,7 +347,7 @@ static int ogg_write_header(AVFormatContext *s) } else if (st->codec->codec_id == CODEC_ID_SPEEX) { int err = ogg_build_speex_headers(st->codec, oggstream, st->codec->flags & CODEC_FLAG_BITEXACT, - s->metadata); + &s->metadata); if (err) { av_log(s, AV_LOG_ERROR, "Error writing Speex headers\n"); av_freep(&st->priv_data); @@ -368,7 +368,7 @@ static int ogg_write_header(AVFormatContext *s) } p = ogg_write_vorbiscomment(7, st->codec->flags & CODEC_FLAG_BITEXACT, - &oggstream->header_len[1], s->metadata, + &oggstream->header_len[1], &s->metadata, framing_bit); if (!p) return AVERROR(ENOMEM); diff --git a/libavformat/vorbiscomment.c b/libavformat/vorbiscomment.c index a0f1c8817d..59a403f209 100644 --- a/libavformat/vorbiscomment.c +++ b/libavformat/vorbiscomment.c @@ -52,15 +52,15 @@ int ff_vorbiscomment_length(AVMetadata *m, const char *vendor_string, return len; } -int ff_vorbiscomment_write(uint8_t **p, AVMetadata *m, +int ff_vorbiscomment_write(uint8_t **p, AVMetadata **m, const char *vendor_string, const unsigned count) { bytestream_put_le32(p, strlen(vendor_string)); bytestream_put_buffer(p, vendor_string, strlen(vendor_string)); - if (m) { + if (*m) { AVMetadataTag *tag = NULL; bytestream_put_le32(p, count); - while ((tag = av_metadata_get(m, "", tag, AV_METADATA_IGNORE_SUFFIX))) { + while ((tag = av_metadata_get(*m, "", tag, AV_METADATA_IGNORE_SUFFIX))) { unsigned int len1 = strlen(tag->key); unsigned int len2 = strlen(tag->value); bytestream_put_le32(p, len1+1+len2); diff --git a/libavformat/vorbiscomment.h b/libavformat/vorbiscomment.h index fe989a0439..3dfe9d226b 100644 --- a/libavformat/vorbiscomment.h +++ b/libavformat/vorbiscomment.h @@ -49,7 +49,7 @@ int ff_vorbiscomment_length(AVMetadata *m, const char *vendor_string, * @param vendor_string The vendor string to write. * @param count The number of tags in m because m->count is "not allowed" */ -int ff_vorbiscomment_write(uint8_t **p, AVMetadata *m, +int ff_vorbiscomment_write(uint8_t **p, AVMetadata **m, const char *vendor_string, const unsigned count); extern const AVMetadataConv ff_vorbiscomment_metadata_conv[]; |