2 files changed, 8 insertions, 0 deletions

diff --git a/lib/rbcodec/metadata/asf.c b/lib/rbcodec/metadata/asf.c
index 0d115099ec..9a74ada453 100644
--- a/lib/rbcodec/metadata/asf.c
+++ b/lib/rbcodec/metadata/asf.c
@@ -375,6 +375,11 @@ static int asf_parse_header(int fd, struct mp3entry* id3,
                             lseek(fd,current.size - 24 - 72 - wfx->datalen,SEEK_CUR);
                             wfx->audiostream = flags&0x7f;
                             id3->codectype = AFMT_WMAVOICE;
+                        } else if (wfx->codec_id == ASF_CODEC_ID_MP3) {
+                            lseek(fd,current.size - 24 - 72,SEEK_CUR);
+                            wfx->audiostream = flags&0x7f;
+                            id3->codectype = AFMT_MPA_L3;
+                            id3->is_asf_stream = true;
                         } else {
                             DEBUGF("Unsupported WMA codec (Lossless, Voice, etc)\n");
                             lseek(fd,current.size - 24 - 72,SEEK_CUR);
diff --git a/lib/rbcodec/metadata/metadata.h b/lib/rbcodec/metadata/metadata.h
index fc9c1d062c..768e62d3b0 100644
--- a/lib/rbcodec/metadata/metadata.h
+++ b/lib/rbcodec/metadata/metadata.h
@@ -316,6 +316,9 @@ struct mp3entry {
 
     /* Musicbrainz Track ID */
     char* mb_track_id;
+
+    /* For ASF files with MP3 audio stream */
+    bool is_asf_stream;
 };
 
 unsigned int probe_file_format(const char *filename);