diff options
Diffstat (limited to 'apps/mp3data.c')
-rw-r--r-- | apps/mp3data.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/mp3data.c b/apps/mp3data.c index a0068edeb9..44208604bc 100644 --- a/apps/mp3data.c +++ b/apps/mp3data.c | |||
@@ -363,7 +363,8 @@ int get_mp3file_info(int fd, struct mp3info *info) | |||
363 | if(header == 0) | 363 | if(header == 0) |
364 | return -1; | 364 | return -1; |
365 | 365 | ||
366 | memset(info, 0, sizeof(struct mp3info)); | 366 | memset(info, 0, sizeof(struct mp3info)); |
367 | memset(frame, 0, sizeof(frame)); | ||
367 | #if CONFIG_CODEC==SWCODEC | 368 | #if CONFIG_CODEC==SWCODEC |
368 | /* These two are needed for proper LAME gapless MP3 playback */ | 369 | /* These two are needed for proper LAME gapless MP3 playback */ |
369 | info->enc_delay = -1; | 370 | info->enc_delay = -1; |
@@ -460,12 +461,12 @@ int get_mp3file_info(int fd, struct mp3info *info) | |||
460 | } | 461 | } |
461 | #if CONFIG_CODEC==SWCODEC | 462 | #if CONFIG_CODEC==SWCODEC |
462 | i += 21; | 463 | i += 21; |
463 | info->enc_delay = (vbrheader[i] << 4) | (vbrheader[i + 1] >> 4); | 464 | info->enc_delay = ((int)vbrheader[i ] << 4) | (vbrheader[i+1] >> 4); |
464 | info->enc_padding = ((vbrheader[i + 1] & 0x0f) << 8) | vbrheader[i + 2]; | 465 | info->enc_padding = ((int)vbrheader[i+1] << 8) | vbrheader[i+2]; |
465 | /* TODO: This sanity checking is rather silly, seeing as how the LAME | 466 | /* TODO: This sanity checking is rather silly, seeing as how the LAME |
466 | header contains a CRC field that can be used to verify integrity. */ | 467 | header contains a CRC field that can be used to verify integrity. */ |
467 | if (!(info->enc_delay >= 0 && info->enc_delay <= 2880 && | 468 | if (!(info->enc_delay >= 0 && info->enc_delay <= 2880 && |
468 | info->enc_padding >= 0 && info->enc_padding <= 2*1152)) | 469 | info->enc_padding >= 0 && info->enc_padding <= 2*1152)) |
469 | { | 470 | { |
470 | /* Invalid data */ | 471 | /* Invalid data */ |
471 | info->enc_delay = -1; | 472 | info->enc_delay = -1; |