diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2003-04-19 02:09:56 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2003-04-19 02:09:56 +0000 |
commit | 1b466e0e58412c4a3df8d50f295b0b7320dd233b (patch) | |
tree | 017f3c641377957164a90a71e7714b029718cf28 /firmware | |
parent | 7fdef57d572a5f81f5efec4fd6f73a4f797cc823 (diff) | |
download | rockbox-1b466e0e58412c4a3df8d50f295b0b7320dd233b.tar.gz rockbox-1b466e0e58412c4a3df8d50f295b0b7320dd233b.zip |
Removed a warning
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3568 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/mp3data.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/firmware/mp3data.c b/firmware/mp3data.c index 98dff50442..1b15092791 100644 --- a/firmware/mp3data.c +++ b/firmware/mp3data.c | |||
@@ -689,15 +689,9 @@ int create_xing_header(int fd, int startpos, int filesize, | |||
689 | 689 | ||
690 | last_pos = pos; | 690 | last_pos = pos; |
691 | } | 691 | } |
692 | } | ||
693 | |||
694 | memcpy(buf + index + 100, cooltext, sizeof(cooltext)); | ||
695 | 692 | ||
696 | /* We must fill in the correct sample rate and mpeg version. If the TOC | 693 | /* Copy the MPEG version and sample rate from the mpeg stream into |
697 | should be generated, we take that data from the actual stream. If not, | 694 | the Xing header */ |
698 | we use the supplied parameters. */ | ||
699 | if(generate_toc) | ||
700 | { | ||
701 | saved_header &= (VERSION_MASK | SAMPLERATE_MASK); | 695 | saved_header &= (VERSION_MASK | SAMPLERATE_MASK); |
702 | 696 | ||
703 | buf[1] |= (saved_header >> 16) & 0xff; | 697 | buf[1] |= (saved_header >> 16) & 0xff; |
@@ -705,9 +699,12 @@ int create_xing_header(int fd, int startpos, int filesize, | |||
705 | } | 699 | } |
706 | else | 700 | else |
707 | { | 701 | { |
702 | /* Fill in the MPEG version and sample rate into the Xing header */ | ||
708 | buf[1] |= mpeg_version << 3; | 703 | buf[1] |= mpeg_version << 3; |
709 | buf[2] |= sample_rate << 2; | 704 | buf[2] |= sample_rate << 2; |
710 | } | 705 | } |
706 | |||
707 | memcpy(buf + index + 100, cooltext, sizeof(cooltext)); | ||
711 | 708 | ||
712 | /* Now get the length of the newly created frame */ | 709 | /* Now get the length of the newly created frame */ |
713 | header = BYTES2INT(buf[0], buf[1], buf[2], buf[3]); | 710 | header = BYTES2INT(buf[0], buf[1], buf[2], buf[3]); |