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/vorbiscomment.h | |
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/vorbiscomment.h')
-rw-r--r-- | libavformat/vorbiscomment.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavformat/vorbiscomment.h b/libavformat/vorbiscomment.h index 4e631e3553..f4212d2632 100644 --- a/libavformat/vorbiscomment.h +++ b/libavformat/vorbiscomment.h @@ -32,11 +32,9 @@ * @param m The metadata structure to be parsed. For no metadata, set to NULL. * @param vendor_string The vendor string to be added into the VorbisComment. * For no string, set to an empty string. - * @param count Pointer to store the number of tags in m because m->count is "not allowed" * @return The length in bytes. */ -int ff_vorbiscomment_length(AVDictionary *m, const char *vendor_string, - unsigned *count); +int ff_vorbiscomment_length(AVDictionary *m, const char *vendor_string); /** * Write a VorbisComment into a buffer. The buffer, p, must have enough @@ -47,10 +45,9 @@ int ff_vorbiscomment_length(AVDictionary *m, const char *vendor_string, * @param p The buffer in which to write. * @param m The metadata struct to write. * @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, AVDictionary **m, - const char *vendor_string, const unsigned count); + const char *vendor_string); extern const AVMetadataConv ff_vorbiscomment_metadata_conv[]; |