---
libavformat/asfdec.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index ca7712f..62c7775 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -263,7 +263,7 @@ static int asf_read_metadata(AVFormatContext *s, const char
*title, uint16_t len
return 0;
}
-static int asf_read_value(AVFormatContext *s, const uint8_t *name, uint16_t
name_len,
+static int asf_read_value(AVFormatContext *s, const uint8_t *name,
uint16_t val_len, int type, AVDictionary **met)
{
int ret;
@@ -328,7 +328,7 @@ static int asf_read_generic_value(AVIOContext *pb, int
type, uint64_t *value)
}
static int asf_set_metadata(AVFormatContext *s, const uint8_t *name,
- uint16_t name_len, int type, AVDictionary **met)
+ int type, AVDictionary **met)
{
AVIOContext *pb = s->pb;
uint64_t value;
@@ -448,7 +448,7 @@ fail:
return ret;
}
-static void get_id3_tag(AVFormatContext *s, int len)
+static void get_id3_tag(AVFormatContext *s)
{
ID3v2ExtraMeta *id3v2_extra_meta = NULL;
@@ -458,7 +458,7 @@ static void get_id3_tag(AVFormatContext *s, int len)
ff_id3v2_free_extra_meta(&id3v2_extra_meta);
}
-static int process_metadata(AVFormatContext *s, const uint8_t *name, uint16_t
name_len,
+static int process_metadata(AVFormatContext *s, const uint8_t *name,
uint16_t val_len, uint16_t type, AVDictionary
**met)
{
int ret;
@@ -467,21 +467,21 @@ static int process_metadata(AVFormatContext *s, const
uint8_t *name, uint16_t na
if (val_len) {
switch (type) {
case ASF_UNICODE:
- asf_read_value(s, name, name_len, val_len, type, met);
+ asf_read_value(s, name, val_len, type, met);
break;
case ASF_BYTE_ARRAY:
if (!strcmp(name, "WM/Picture")) // handle cover art
asf_read_picture(s, val_len);
else if (!strcmp(name, "ID3")) // handle ID3 tag
- get_id3_tag(s, val_len);
+ get_id3_tag(s);
else
- asf_read_value(s, name, name_len, val_len, type, met);
+ asf_read_value(s, name, val_len, type, met);
break;
case ASF_GUID:
ff_get_guid(s->pb, &guid);
break;
default:
- if ((ret = asf_set_metadata(s, name, name_len, type, met)) < 0)
+ if ((ret = asf_set_metadata(s, name, type, met)) < 0)
return ret;
break;
}
@@ -517,7 +517,7 @@ static int asf_read_ext_content(AVFormatContext *s, const
GUIDParseTable *g)
type = ASF_DWORD;
val_len = avio_rl16(pb);
- ret = process_metadata(s, name, name_len, val_len, type, &s->metadata);
+ ret = process_metadata(s, name, val_len, type, &s->metadata);
av_freep(&name);
if (ret < 0)
return ret;
@@ -596,7 +596,7 @@ static int asf_read_metadata_obj(AVFormatContext *s, const
GUIDParseTable *g)
}
} else {
if (st_num < ASF_MAX_STREAMS) {
- if ((ret = process_metadata(s, name, name_len, val_len, type,
+ if ((ret = process_metadata(s, name, val_len, type,
&asf->asf_sd[st_num].asf_met)) <
0) {
av_freep(&name);
break;
@@ -1204,8 +1204,7 @@ static int asf_read_multiple_payload(AVFormatContext *s,
AVPacket *pkt,
return 0;
}
-static int asf_read_single_payload(AVFormatContext *s, AVPacket *pkt,
- ASFPacket *asf_pkt)
+static int asf_read_single_payload(AVFormatContext *s, ASFPacket *asf_pkt)
{
ASFContext *asf = s->priv_data;
AVIOContext *pb = s->pb;
@@ -1310,7 +1309,7 @@ static int asf_read_payload(AVFormatContext *s, AVPacket
*pkt)
if ((ret = asf_read_subpayload(s, pkt, 1)) < 0)
return ret;
} else {
- if ((ret = asf_read_single_payload(s, pkt, asf_pkt)) < 0)
+ if ((ret = asf_read_single_payload(s, asf_pkt)) < 0)
return ret;
}
} else {
--
2.1.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
