Rename ff_id3v2_read_all to ff_id3v2_read().
---
libavformat/id3v2.c | 7 +------
libavformat/id3v2.h | 9 ++-------
libavformat/omadec.c | 2 +-
libavformat/utils.c | 2 +-
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 44e1e75..a0c4771 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -653,7 +653,7 @@ seek:
return;
}
-void ff_id3v2_read_all(AVFormatContext *s, const char *magic, ID3v2ExtraMeta
**extra_meta)
+void ff_id3v2_read(AVFormatContext *s, const char *magic, ID3v2ExtraMeta
**extra_meta)
{
int len, ret;
uint8_t buf[ID3v2_HEADER_SIZE];
@@ -684,11 +684,6 @@ void ff_id3v2_read_all(AVFormatContext *s, const char
*magic, ID3v2ExtraMeta **e
merge_date(&s->metadata);
}
-void ff_id3v2_read(AVFormatContext *s, const char *magic)
-{
- ff_id3v2_read_all(s, magic, NULL);
-}
-
void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta)
{
ID3v2ExtraMeta *current = *extra_meta, *next;
diff --git a/libavformat/id3v2.h b/libavformat/id3v2.h
index 3e78e2c..629dfd9 100644
--- a/libavformat/id3v2.h
+++ b/libavformat/id3v2.h
@@ -84,16 +84,11 @@ int ff_id3v2_match(const uint8_t *buf, const char *magic);
int ff_id3v2_tag_len(const uint8_t *buf);
/**
- * Read an ID3v2 tag (text tags only)
- */
-void ff_id3v2_read(AVFormatContext *s, const char *magic);
-
-/**
- * Read an ID3v2 tag, including supported extra metadata (currently only GEOB)
+ * Read an ID3v2 tag, including supported extra metadata
* @param extra_meta If not NULL, extra metadata is parsed into a list of
* ID3v2ExtraMeta structs and *extra_meta points to the head of the list
*/
-void ff_id3v2_read_all(AVFormatContext *s, const char *magic, ID3v2ExtraMeta
**extra_meta);
+void ff_id3v2_read(AVFormatContext *s, const char *magic, ID3v2ExtraMeta
**extra_meta);
/**
* Write an ID3v2 tag.
diff --git a/libavformat/omadec.c b/libavformat/omadec.c
index fc9c292..ae7513c 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -267,7 +267,7 @@ static int oma_read_header(AVFormatContext *s)
ID3v2ExtraMeta *extra_meta = NULL;
OMAContext *oc = s->priv_data;
- ff_id3v2_read_all(s, ID3v2_EA3_MAGIC, &extra_meta);
+ ff_id3v2_read(s, ID3v2_EA3_MAGIC, &extra_meta);
ret = avio_read(s->pb, buf, EA3_HEADER_SIZE);
if (ret < EA3_HEADER_SIZE)
return -1;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index e657362..cf4392b 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -563,7 +563,7 @@ int avformat_open_input(AVFormatContext **ps, const char
*filename, AVInputForma
/* e.g. AVFMT_NOFILE formats will not have a AVIOContext */
if (s->pb)
- ff_id3v2_read_all(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
+ ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
if (s->iformat->read_header)
if ((ret = s->iformat->read_header(s)) < 0)
--
1.7.9
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
