From 393fd0d89e6d0a1cf5bd39f309f6f10e0f1f8ac7 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sat, 25 Feb 2012 09:53:59 +0100
Subject: id3v2: remove unused ff_id3v2_read().

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 4170c853a6..1f2c3d5437 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 c3f08f5875..5f3ec1b3ca 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 7c54ffbc97..810e970c11 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 e657362a38..cf4392b581 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)
-- 
cgit v1.2.3