Mercurial > mplayer.hg
comparison stream/network.c @ 30621:300fd6ee0f8b
Fix mov reference files: for video/quicktime mime do not force a demuxer
but do autodetection. This tries lavf first but will also try native demuxer
for reference files where open fails for the lavf demuxer.
| author | reimar |
|---|---|
| date | Sat, 20 Feb 2010 11:48:41 +0000 |
| parents | 74a6c2a3dcce |
| children | 8ae498c98fec |
comparison
equal
deleted
inserted
replaced
| 30620:d6f2e0515ad3 | 30621:300fd6ee0f8b |
|---|---|
| 69 | 69 |
| 70 const mime_struct_t mime_type_table[] = { | 70 const mime_struct_t mime_type_table[] = { |
| 71 #ifdef CONFIG_LIBAVFORMAT | 71 #ifdef CONFIG_LIBAVFORMAT |
| 72 // Flash Video | 72 // Flash Video |
| 73 { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, | 73 { "video/x-flv", DEMUXER_TYPE_LAVF_PREFERRED}, |
| 74 { "video/quicktime", DEMUXER_TYPE_LAVF_PREFERRED }, | 74 // do not force any demuxer in this case! |
| 75 // we want the lavf demuxer to be tried first (happens automatically anyway), | |
| 76 // but for mov reference files to work we must also try | |
| 77 // the native demuxer if lavf fails. | |
| 78 { "video/quicktime", 0 }, | |
| 75 #endif | 79 #endif |
| 76 // MP3 streaming, some MP3 streaming server answer with audio/mpeg | 80 // MP3 streaming, some MP3 streaming server answer with audio/mpeg |
| 77 { "audio/mpeg", DEMUXER_TYPE_AUDIO }, | 81 { "audio/mpeg", DEMUXER_TYPE_AUDIO }, |
| 78 // MPEG streaming | 82 // MPEG streaming |
| 79 { "video/mpeg", DEMUXER_TYPE_UNKNOWN }, | 83 { "video/mpeg", DEMUXER_TYPE_UNKNOWN }, |