Mercurial > libavformat.hg
view vorbiscomment.c @ 5902:dbbcecb1a0dd libavformat
Fix NUT (de)muxer warnings:
CC libavformat/nutdec.o
libavformat/nutdec.c: In function ¡Æread_seek¡Ç:
libavformat/nutdec.c:862: warning: passing argument 3 of ¡Æav_tree_find¡Ç from incompatible pointer type
./libavutil/tree.h:44: note: expected ¡Æint (*)(void *, const void *)¡Ç but argument is of type ¡Æint (*)(struct Syncpoint *, struct Syncpoint *)¡Ç
libavformat/nutdec.c:871: warning: passing argument 3 of ¡Æav_tree_find¡Ç from incompatible pointer type
./libavutil/tree.h:44: note: expected ¡Æint (*)(void *, const void *)¡Ç but argument is of type ¡Æint (*)(struct Syncpoint *, struct Syncpoint *)¡Ç
libavformat/nutdec.c:879: warning: passing argument 3 of ¡Æav_tree_find¡Ç from incompatible pointer type
./libavutil/tree.h:44: note: expected ¡Æint (*)(void *, const void *)¡Ç but argument is of type ¡Æint (*)(struct Syncpoint *, struct Syncpoint *)¡Ç
CC libavformat/nutenc.o
libavformat/nutenc.c: In function ¡Æwrite_packet¡Ç:
libavformat/nutenc.c:680: warning: passing argument 3 of ¡Æav_tree_find¡Ç from incompatible pointer type
./libavutil/tree.h:44: note: expected ¡Æint (*)(void *, const void *)¡Ç but argument is of type ¡Æint (*)(struct Syncpoint *, struct Syncpoint *)¡Ç
author | vitor |
---|---|
date | Sun, 28 Mar 2010 09:59:58 +0000 |
parents | 121d6994c20e |
children | a8abcc0f32cf |
line wrap: on
line source
/* * VorbisComment writer * Copyright (c) 2009 James Darnley * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" #include "metadata.h" #include "vorbiscomment.h" #include "libavcodec/bytestream.h" /** * VorbisComment metadata conversion mapping. * from Ogg Vorbis I format specification: comment field and header specification * http://xiph.org/vorbis/doc/v-comment.html */ const AVMetadataConv ff_vorbiscomment_metadata_conv[] = { { "ALBUMARTIST", "album_artist"}, { "TRACKNUMBER", "track" }, { 0 } }; int ff_vorbiscomment_length(AVMetadata *m, const char *vendor_string, unsigned *count) { int len = 8; len += strlen(vendor_string); *count = 0; if (m) { AVMetadataTag *tag = NULL; while ( (tag = av_metadata_get(m, "", tag, AV_METADATA_IGNORE_SUFFIX) ) ) { len += 4 +strlen(tag->key) + 1 + strlen(tag->value); (*count)++; } } return len; } 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) { AVMetadataTag *tag = NULL; bytestream_put_le32(p, count); 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); bytestream_put_buffer(p, tag->key, len1); bytestream_put_byte(p, '='); bytestream_put_buffer(p, tag->value, len2); } } else bytestream_put_le32(p, 0); return 0; }