Mercurial > mplayer.hg
changeset 30475:9f36eccc490a
Prefer libavformat over our own mov demuxer also for video/quicktime
mime-type.
| author | reimar |
|---|---|
| date | Fri, 05 Feb 2010 17:35:48 +0000 |
| parents | 31a00b2a621f |
| children | e6af8f398880 |
| files | stream/network.c |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/network.c Fri Feb 05 17:20:21 2010 +0000 +++ b/stream/network.c Fri Feb 05 17:35:48 2010 +0000 @@ -68,6 +68,11 @@ 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 @@ // 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}, };