[FFmpeg-cvslog] id3v2: constify the 'tag' parameter to special metadata parsing callback

Anton Khirnov git at videolan.org
Thu Jan 15 12:52:12 CET 2015


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Jan 10 09:39:32 2015 +0100| [8809c974a3fb51f96e498a5556a4a5bbacc581ce] | committer: Vittorio Giovara

id3v2: constify the 'tag' parameter to special metadata parsing callback

Those functions should not ever modify it.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8809c974a3fb51f96e498a5556a4a5bbacc581ce
---

 libavformat/id3v2.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index e5f7486..cef1d9f 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -300,7 +300,7 @@ static void read_ttag(AVFormatContext *s, AVIOContext *pb, int taglen,
  * Parse GEOB tag into a ID3v2ExtraMetaGEOB struct.
  */
 static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen,
-                         char *tag, ID3v2ExtraMeta **extra_meta)
+                         const char *tag, ID3v2ExtraMeta **extra_meta)
 {
     ID3v2ExtraMetaGEOB *geob_data = NULL;
     ID3v2ExtraMeta *new_extra     = NULL;
@@ -432,7 +432,7 @@ static void free_apic(void *obj)
 }
 
 static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen,
-                      char *tag, ID3v2ExtraMeta **extra_meta)
+                      const char *tag, ID3v2ExtraMeta **extra_meta)
 {
     int enc, pic_type;
     char mimetype[64];
@@ -508,7 +508,7 @@ fail:
 typedef struct ID3v2EMFunc {
     const char *tag3;
     const char *tag4;
-    void (*read)(AVFormatContext *, AVIOContext *, int, char *,
+    void (*read)(AVFormatContext *, AVIOContext *, int, const char *,
                  ID3v2ExtraMeta **);
     void (*free)(void *obj);
 } ID3v2EMFunc;



More information about the ffmpeg-cvslog mailing list