diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-09 14:52:23 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-09 14:52:23 +0000 |
| commit | 441a1048fff9d43cc761a20c8b9fc8c277bdf293 (patch) | |
| tree | 547e7cf11c53667f91c62811ce15b4bb811d7b55 /libmpdemux | |
| parent | 37286ef90a34a52ec334274910736a693e47bc53 (diff) | |
| download | mpv-441a1048fff9d43cc761a20c8b9fc8c277bdf293.tar.bz2 mpv-441a1048fff9d43cc761a20c8b9fc8c277bdf293.tar.xz | |
added some new types
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6033 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/network.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libmpdemux/network.c b/libmpdemux/network.c index 8a91034073..f0161851d0 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -38,6 +38,8 @@ static struct { { "audio/mpeg", DEMUXER_TYPE_AUDIO }, // MPEG streaming { "video/mpeg", DEMUXER_TYPE_MPEG_PS }, + { "video/x-mpeg", DEMUXER_TYPE_MPEG_PS }, + { "video/x-mpeg2", DEMUXER_TYPE_MPEG_PS }, // AVI ??? => video/x-msvideo { "video/x-msvideo", DEMUXER_TYPE_AVI }, // MOV => video/quicktime @@ -53,7 +55,9 @@ static struct { // Playlists { "audio/x-scpls", DEMUXER_TYPE_PLAYLIST }, { "audio/x-mpegurl", DEMUXER_TYPE_PLAYLIST }, - { "audio/x-pls", DEMUXER_TYPE_PLAYLIST } + { "audio/x-pls", DEMUXER_TYPE_PLAYLIST }, + // Real Media + { "audio/x-pn-realaudio", DEMUXER_TYPE_REAL } }; static struct { @@ -72,6 +76,7 @@ static struct { { "wma", DEMUXER_TYPE_ASF }, { "viv", DEMUXER_TYPE_VIVO }, { "rm", DEMUXER_TYPE_REAL }, + { "ra", DEMUXER_TYPE_REAL }, { "y4m", DEMUXER_TYPE_Y4M }, { "mp3", DEMUXER_TYPE_AUDIO }, { "wav", DEMUXER_TYPE_AUDIO }, @@ -797,6 +802,7 @@ streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) { } mp_msg(MSGT_NETWORK,MSGL_INFO,"Cache size set to %d KBytes\n", cache_size ); } + return ret; } |