diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-10-14 19:08:31 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2010-10-14 19:08:31 +0000 |
| commit | 81e5ff7ae2f69ac6873bfbdcdaddf0fabd653d15 (patch) | |
| tree | cee5176e8aa763c0c3768ff09e26ef0f3cab1d3e /libavformat/flacenc.c | |
| parent | da7548585e1ed0fdb1c337c2f07ab313c99122a5 (diff) | |
vorbiscomment: change ff_vorbiscomment_write to take an AVMetadata**
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25473 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/flacenc.c')
| -rw-r--r-- | libavformat/flacenc.c | 6 |
1 files changed, 3 insertions, 3 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; |