diff --git a/libavformat/vorbiscomment.c b/libavformat/vorbiscomment.c
index e953d83d65..575dd13328 100644
--- a/libavformat/vorbiscomment.c
+++ b/libavformat/vorbiscomment.c
@@ -38,9 +38,9 @@ const AVMetadataConv ff_vorbiscomment_metadata_conv[] = {
     { 0 }
 };
 
-int ff_vorbiscomment_length(AVDictionary *m, const char *vendor_string)
+int64_t ff_vorbiscomment_length(AVDictionary *m, const char *vendor_string)
 {
-    int len = 8;
+    int64_t len = 8;
     len += strlen(vendor_string);
     if (m) {
         AVDictionaryEntry *tag = NULL;
diff --git a/libavformat/vorbiscomment.h b/libavformat/vorbiscomment.h
index f4212d2632..e0d30b14a7 100644
--- a/libavformat/vorbiscomment.h
+++ b/libavformat/vorbiscomment.h
@@ -34,7 +34,7 @@
  * For no string, set to an empty string.
  * @return The length in bytes.
  */
-int ff_vorbiscomment_length(AVDictionary *m, const char *vendor_string);
+int64_t ff_vorbiscomment_length(AVDictionary *m, const char *vendor_string);
 
 /**
  * Write a VorbisComment into a buffer. The buffer, p, must have enough