virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

id3v2: remove unused ff_id3v2_read().

Browse Source 
Rename ff_id3v2_read_all to ff_id3v2_read().
This commit is contained in:
Anton Khirnov 2012-02-25 09:53:59 +01:00
parent 079ea6ca5f
commit 393fd0d89e
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/id3v2.c
View File

@ -653,7 +653,7 @@ seek:
return; 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; int len, ret;
uint8_t buf[ID3v2_HEADER_SIZE]; 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); 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) void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta)
{ {
ID3v2ExtraMeta *current = *extra_meta, *next; ID3v2ExtraMeta *current = *extra_meta, *next;

9
libavformat/id3v2.h
View File

@ -84,16 +84,11 @@ int ff_id3v2_match(const uint8_t *buf, const char *magic);
int ff_id3v2_tag_len(const uint8_t *buf); int ff_id3v2_tag_len(const uint8_t *buf);
/** /**
* Read an ID3v2 tag (text tags only) * Read an ID3v2 tag, including supported extra metadata
*/
void ff_id3v2_read(AVFormatContext *s, const char *magic);
/**
* Read an ID3v2 tag, including supported extra metadata (currently only GEOB)
* @param extra_meta If not NULL, extra metadata is parsed into a list of * @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 * 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. * Write an ID3v2 tag.

2
libavformat/omadec.c
View File

@ -267,7 +267,7 @@ static int oma_read_header(AVFormatContext *s)
ID3v2ExtraMeta *extra_meta = NULL; ID3v2ExtraMeta *extra_meta = NULL;
OMAContext *oc = s->priv_data; 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); ret = avio_read(s->pb, buf, EA3_HEADER_SIZE);
if (ret < EA3_HEADER_SIZE) if (ret < EA3_HEADER_SIZE)
return -1; return -1;

2
libavformat/utils.c
View File

@ -563,7 +563,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
/* e.g. AVFMT_NOFILE formats will not have a AVIOContext */ /* e.g. AVFMT_NOFILE formats will not have a AVIOContext */
if (s->pb) 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 (s->iformat->read_header)
if ((ret = s->iformat->read_header(s)) < 0) if ((ret = s->iformat->read_header(s)) < 0)