summaryrefslogtreecommitdiff
path: root/libavformat/mp3.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-07-11 07:41:11 +0000
committerDiego Biurrun <diego@biurrun.de>2008-07-11 07:41:11 +0000
commit58607ca7d23bd71ce7df2a12e99d3eee1f741dae (patch)
treeac777101e33747ad33a5cabfbf5bba3eea07539c /libavformat/mp3.c
parent37673b1bddaa99fa6b6c0ed8292c7d9381b4835c (diff)
Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
Originally committed as revision 14164 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mp3.c')
-rw-r--r--libavformat/mp3.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index e987904f6a..346c7ea158 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -360,37 +360,6 @@ static int id3v1_parse_tag(AVFormatContext *s, const uint8_t *buf)
return 0;
}
-static void id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
-{
- int v, i;
-
- memset(buf, 0, ID3v1_TAG_SIZE); /* fail safe */
- buf[0] = 'T';
- buf[1] = 'A';
- buf[2] = 'G';
- strncpy(buf + 3, s->title, 30);
- strncpy(buf + 33, s->author, 30);
- strncpy(buf + 63, s->album, 30);
- v = s->year;
- if (v > 0) {
- for(i = 0;i < 4; i++) {
- buf[96 - i] = '0' + (v % 10);
- v = v / 10;
- }
- }
- strncpy(buf + 97, s->comment, 30);
- if (s->track != 0) {
- buf[125] = 0;
- buf[126] = s->track;
- }
- for(i = 0; i <= ID3v1_GENRE_MAX; i++) {
- if (!strcasecmp(s->genre, id3v1_genre_str[i])) {
- buf[127] = i;
- break;
- }
- }
-}
-
/* mp3 read */
static int mp3_read_probe(AVProbeData *p)
@@ -552,6 +521,37 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
}
#ifdef CONFIG_MUXERS
+static void id3v1_create_tag(AVFormatContext *s, uint8_t *buf)
+{
+ int v, i;
+
+ memset(buf, 0, ID3v1_TAG_SIZE); /* fail safe */
+ buf[0] = 'T';
+ buf[1] = 'A';
+ buf[2] = 'G';
+ strncpy(buf + 3, s->title, 30);
+ strncpy(buf + 33, s->author, 30);
+ strncpy(buf + 63, s->album, 30);
+ v = s->year;
+ if (v > 0) {
+ for(i = 0;i < 4; i++) {
+ buf[96 - i] = '0' + (v % 10);
+ v = v / 10;
+ }
+ }
+ strncpy(buf + 97, s->comment, 30);
+ if (s->track != 0) {
+ buf[125] = 0;
+ buf[126] = s->track;
+ }
+ for(i = 0; i <= ID3v1_GENRE_MAX; i++) {
+ if (!strcasecmp(s->genre, id3v1_genre_str[i])) {
+ buf[127] = i;
+ break;
+ }
+ }
+}
+
/* simple formats */
static void id3v2_put_size(AVFormatContext *s, int size)