aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-11 21:19:24 +0000
committerGravatar rtogni <rtogni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-10-11 21:19:24 +0000
commit1e418cb5f167f5402971f75ed97c2f78889121ef (patch)
tree095be2cd1cb6139a28c0c66a62de6593f9df639a
parentee88e6f26fcacea021c5f0f78258ba1f6f43d7ef (diff)
Remove old hack to search for .ar and VIDO, we know where they are
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20165 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_real.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 6d57a3fdbc..999cfd9a1c 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -1252,15 +1252,7 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer)
if (!strncmp(mimet,"audio/",6)) {
if (strstr(mimet,"x-pn-realaudio") || strstr(mimet,"x-pn-multirate-realaudio")) {
- // skip unknown shit - FIXME: find a better/cleaner way!
- len=codec_data_size;
tmp = stream_read_dword(demuxer->stream);
-// mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_real: type_spec: len=%d fpos=0x%X first_dword=0x%X (%.4s) \n",
-// (int)codec_data_size,(int)codec_pos,tmp,&tmp);
- while(--len>=8){
- if(tmp==MKTAG(0xfd, 'a', 'r', '.')) break; // audio
- tmp=(tmp<<8)|stream_read_char(demuxer->stream);
- }
if (tmp != MKTAG(0xfd, 'a', 'r', '.'))
{
mp_msg(MSGT_DEMUX,MSGL_V,"Audio: can't find .ra in codec data\n");
@@ -1506,15 +1498,8 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer)
}
} else if (!strncmp(mimet,"video/",6)) {
if (strstr(mimet,"x-pn-realvideo") || strstr(mimet,"x-pn-multirate-realvideo")) {
+ stream_skip(demuxer->stream, 4); // VIDO length, same as codec_data_size
tmp = stream_read_dword(demuxer->stream);
-// mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_real: type_spec: len=%d fpos=0x%X first_dword=0x%X (%.4s) \n",
-// (int)codec_data_size,(int)codec_pos,tmp,&tmp);
- // skip unknown shit - FIXME: find a better/cleaner way!
- len=codec_data_size;
- while(--len>=8){
- if(tmp==MKTAG('O', 'D', 'I', 'V')) break; // video
- tmp=(tmp<<8)|stream_read_char(demuxer->stream);
- }
if(tmp != MKTAG('O', 'D', 'I', 'V'))
{
mp_msg(MSGT_DEMUX,MSGL_V,"Video: can't find VIDO in codec data\n");