diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 22:47:41 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 22:47:41 +0200 |
| commit | 8e593f5a34b4827d6ec97dd875c802267a6f03b7 (patch) | |
| tree | 648fde930e4a2b836a9803b17944c370a9608c72 /stream | |
| parent | bf31241e932818df3bc2eba55cf06c2b9ee3f56f (diff) | |
| parent | 5c10618fa191d306e6d6674dd2fc7ad46476f85d (diff) | |
| download | mpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.bz2 mpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.xz | |
Merge svn changes up to r30529
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/network.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/stream/network.c b/stream/network.c index 0e1771113f..5802b85c67 100644 --- a/stream/network.c +++ b/stream/network.c @@ -68,6 +68,11 @@ int network_ipv4_only_proxy = 0; const mime_struct_t mime_type_table[] = { +#ifdef CONFIG_LIBAVFORMAT + // Flash Video + { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, + { "video/quicktime", DEMUXER_TYPE_LAVF_PREFERRED }, +#endif // MP3 streaming, some MP3 streaming server answer with audio/mpeg { "audio/mpeg", DEMUXER_TYPE_AUDIO }, // MPEG streaming @@ -101,10 +106,6 @@ const mime_struct_t mime_type_table[] = { // NullSoft Streaming Video { "video/nsv", DEMUXER_TYPE_NSV}, { "misc/ultravox", DEMUXER_TYPE_NSV}, -#ifdef CONFIG_LIBAVFORMAT - // Flash Video - { "video/x-flv", DEMUXER_TYPE_LAVF}, -#endif { NULL, DEMUXER_TYPE_UNKNOWN}, }; |