diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 12:45:20 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 12:45:20 +0100 |
commit | 06ec2f1d321830e3a7dd24e3d0a10bd886c8c74b (patch) | |
tree | b420825f37fe5aca9fc7ab18898ea196122ac562 /libavformat/id3v2.c | |
parent | 3b3229aef322f2348c8e9e389a22d7b7fd7ef7f4 (diff) | |
parent | 8809c974a3fb51f96e498a5556a4a5bbacc581ce (diff) |
Merge commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce'
* commit '8809c974a3fb51f96e498a5556a4a5bbacc581ce':
id3v2: constify the 'tag' parameter to special metadata parsing callback
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/id3v2.c')
-rw-r--r-- | libavformat/id3v2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 02955ffc87..df0d834bf2 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -404,7 +404,7 @@ error: * Parse GEOB tag into a ID3v2ExtraMetaGEOB struct. */ static void read_geobtag(AVFormatContext *s, AVIOContext *pb, int taglen, - char *tag, ID3v2ExtraMeta **extra_meta, int isv34) + const char *tag, ID3v2ExtraMeta **extra_meta, int isv34) { ID3v2ExtraMetaGEOB *geob_data = NULL; ID3v2ExtraMeta *new_extra = NULL; @@ -536,7 +536,7 @@ static void free_apic(void *obj) } static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, - char *tag, ID3v2ExtraMeta **extra_meta, int isv34) + const char *tag, ID3v2ExtraMeta **extra_meta, int isv34) { int enc, pic_type; char mimetype[64]; @@ -717,7 +717,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 **, int isv34); void (*free)(void *obj); } ID3v2EMFunc; |