diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:08:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:08:50 +0200 |
| commit | dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb (patch) | |
| tree | e50cc5c08974c011ff14516a14d602605eee065a /libavformat/flacenc.c | |
| parent | 579e2b2874aeaa9cfdeed1fd1408767e33a63029 (diff) | |
| parent | efcde917af407a6031ecff68edd51fce7b83d104 (diff) | |
| download | ffmpeg-dff4aa6afd40bcc6c71b5a21d229fb941f9fc1eb.tar.gz | |
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/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 f0b7d2956e..ae8e171fb1 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -47,12 +47,12 @@ static int flac_write_block_comment(AVIOContext *pb, AVDictionary **m, int last_block, int bitexact) { const char *vendor = bitexact ? "ffmpeg" : LIBAVFORMAT_IDENT; - unsigned int len, count; + unsigned int len; uint8_t *p, *p0; ff_metadata_conv(m, ff_vorbiscomment_metadata_conv, NULL); - len = ff_vorbiscomment_length(*m, vendor, &count); + len = ff_vorbiscomment_length(*m, vendor); p0 = av_malloc(len+4); if (!p0) return AVERROR(ENOMEM); @@ -60,7 +60,7 @@ static int flac_write_block_comment(AVIOContext *pb, AVDictionary **m, bytestream_put_byte(&p, last_block ? 0x84 : 0x04); bytestream_put_be24(&p, len); - ff_vorbiscomment_write(&p, m, vendor, count); + ff_vorbiscomment_write(&p, m, vendor); avio_write(pb, p0, len+4); av_freep(&p0); |