Actually id3v2_tagsize was used by demux_mpgaudio and demux_aac; but as it makes little sense, move BE_*_synchsafe functions from id3.c to id3.h and declare them inline, then BE_32_synchsafe can be replaced to id3v2_tagsize as drop in.

1 files changed, 0 insertions, 32 deletions

diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index e9ed43d4d..a59eb6259 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -227,38 +227,6 @@ static int id3v2_parse_genre(char* dest, char *src, int len) {
   return 1;
 }
 
-#if 0
-/* parse an unsynchronized 16bits integer */
-static uint16_t BE_16_synchsafe(uint8_t buf[2]) {
-  return ((uint16_t)(buf[0] & 0x7F) << 7) |
-          (uint16_t)(buf[1] & 0x7F);
-}
-#endif
-
-/* parse an unsynchronized 24bits integer */
-static uint32_t BE_24_synchsafe(uint8_t buf[3]) {
-  return ((uint32_t)(buf[0] & 0x7F) << 14) |
-         ((uint32_t)(buf[1] & 0x7F) << 7) |
-          (uint32_t)(buf[2] & 0x7F);
-}
-
-/* parse an unsynchronized 32bits integer */
-static uint32_t BE_32_synchsafe(uint8_t buf[4]) {
-  return ((uint32_t)(buf[0] & 0x7F) << 21) |
-         ((uint32_t)(buf[1] & 0x7F) << 14) |
-         ((uint32_t)(buf[2] & 0x7F) << 7) |
-          (uint32_t)(buf[3] & 0x7F);
-}
-
-/* parse an unsynchronized 35bits integer */
-static uint32_t BE_35_synchsafe(uint8_t buf[5]) {
-  return ((uint32_t)(buf[0] & 0x07) << 28) |
-         ((uint32_t)(buf[1] & 0x7F) << 21) |
-         ((uint32_t)(buf[2] & 0x7F) << 14) |
-         ((uint32_t)(buf[3] & 0x7F) << 7) |
-          (uint32_t)(buf[4] & 0x7F);
-}
-
 static int id3v2_parse_header(input_plugin_t *input, uint8_t *mp3_frame_header,
                               id3v2_header_t *tag_header) {
   uint8_t buf[6];