summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_real.c
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-15 15:07:24 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-15 15:07:24 +0000
commit810a5a72361e8a29ee53edd44ac0a743cb3894eb (patch)
tree77a9ca2192a4236a4015962f088cfb29938883f4 /libmpdemux/demux_real.c
parentfa361ca9204203a67fda6d1275e59ee60a31249d (diff)
downloadmpv-810a5a72361e8a29ee53edd44ac0a743cb3894eb.tar.bz2
mpv-810a5a72361e8a29ee53edd44ac0a743cb3894eb.tar.xz
Decode MP3 in rm files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14499 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_real.c')
-rw-r--r--libmpdemux/demux_real.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 3de331bfb2..86c16b89cd 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -1400,8 +1400,7 @@ void demux_open_real(demuxer_t* demuxer)
#undef stream_skip
#endif
}
-#if 0
- } else if (strstr(mimet,"X-MP3")) {
+ } else if (strstr(mimet,"X-MP3-draft-00")) {
sh_audio_t *sh = new_sh_audio(demuxer, stream_id);
/* Emulate WAVEFORMATEX struct: */
@@ -1413,7 +1412,7 @@ void demux_open_real(demuxer_t* demuxer)
sh->wf->nAvgBytesPerSec = 0;//bitrate;
sh->wf->nBlockAlign = 0;//frame_size;
sh->wf->cbSize = 0;
- sh->wf->wFormatTag = sh->format = 0x55;
+ sh->wf->wFormatTag = sh->format = mmioFOURCC('a','d','u',0x55);
if(demuxer->audio->id==stream_id){
sh->ds=demuxer->audio;
@@ -1421,7 +1420,6 @@ void demux_open_real(demuxer_t* demuxer)
}
++a_streams;
-#endif
} else if (strstr(mimet,"x-ralf-mpeg4")) {
mp_msg(MSGT_DEMUX,MSGL_ERR,"Real lossless audio not supported yet\n");
} else {