diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 15:08:50 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 15:08:50 +0400 |
| commit | dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb (patch) | |
| tree | e50cc5c08974c011ff14516a14d602605eee065a /libavformat/oggenc.c | |
| parent | 579e2b2874aeaa9cfdeed1fd1408767e33a63029 (diff) | |
| parent | efcde917af407a6031ecff68edd51fce7b83d104 (diff) | |
Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'
* commit 'efcde917af407a6031ecff68edd51fce7b83d104':
vorbiscomment: simplify API by using av_dict_count()
Conflicts:
libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggenc.c')
| -rw-r--r-- | libavformat/oggenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 9f75538daa..bec3917a21 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -277,18 +277,17 @@ static uint8_t *ogg_write_vorbiscomment(int offset, int bitexact, const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT; int size; uint8_t *p, *p0; - unsigned int count; ff_metadata_conv(m, ff_vorbiscomment_metadata_conv, NULL); - size = offset + ff_vorbiscomment_length(*m, vendor, &count) + framing_bit; + size = offset + ff_vorbiscomment_length(*m, vendor) + framing_bit; p = av_mallocz(size); if (!p) return NULL; p0 = p; p += offset; - ff_vorbiscomment_write(&p, m, vendor, count); + ff_vorbiscomment_write(&p, m, vendor); if (framing_bit) bytestream_put_byte(&p, 1); |