Commit da457e70 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Simplify code by using av_metadata_set2().

somewhat based on ffmbc

Originally committed as revision 20840 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent dfe9ee6b
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "id3v1.h" #include "id3v1.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavutil/avstring.h"
const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = { const char * const ff_id3v1_genre_str[ID3v1_GENRE_MAX + 1] = {
[0] = "Blues", [0] = "Blues",
...@@ -201,7 +202,6 @@ static void get_string(AVFormatContext *s, const char *key, ...@@ -201,7 +202,6 @@ static void get_string(AVFormatContext *s, const char *key,
*/ */
static int parse_tag(AVFormatContext *s, const uint8_t *buf) static int parse_tag(AVFormatContext *s, const uint8_t *buf)
{ {
char str[5];
int genre; int genre;
if (!(buf[0] == 'T' && if (!(buf[0] == 'T' &&
...@@ -213,10 +213,8 @@ static int parse_tag(AVFormatContext *s, const uint8_t *buf) ...@@ -213,10 +213,8 @@ static int parse_tag(AVFormatContext *s, const uint8_t *buf)
get_string(s, "album", buf + 63, 30); get_string(s, "album", buf + 63, 30);
get_string(s, "year", buf + 93, 4); get_string(s, "year", buf + 93, 4);
get_string(s, "comment", buf + 97, 30); get_string(s, "comment", buf + 97, 30);
if (buf[125] == 0 && buf[126] != 0) { if (buf[125] == 0 && buf[126] != 0)
snprintf(str, sizeof(str), "%d", buf[126]); av_metadata_set2(&s->metadata, "track", av_d2str(buf[126]), AV_METADATA_DONT_STRDUP_VAL);
av_metadata_set(&s->metadata, "track", str);
}
genre = buf[127]; genre = buf[127];
if (genre <= ID3v1_GENRE_MAX) if (genre <= ID3v1_GENRE_MAX)
av_metadata_set(&s->metadata, "genre", ff_id3v1_genre_str[genre]); av_metadata_set(&s->metadata, "genre", ff_id3v1_genre_str[genre]);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment