summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-18 11:13:58 +0200
committerwm4 <wm4@nowhere>2012-08-20 15:36:02 +0200
commit8ca3ec1562986c0681261cad407e05578eda45fd (patch)
tree0822a5c95e2b0e26ec9497e6826a98db8704dfa2 /stream
parentfc2ea37694a6e508fe6ebc56711b11be592c7a8d (diff)
downloadmpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.bz2
mpv-8ca3ec1562986c0681261cad407e05578eda45fd.tar.xz
libmpdemux: remove demux_real, demux_viv, demux_audio
libavformat replaces demux_audio completely. I don't know/care what vivo (demux_viv) is. libavformat has a Real demuxer; it seems it works slightly better, with a different set of bugs.
Diffstat (limited to 'stream')
-rw-r--r--stream/http.c2
-rw-r--r--stream/network.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/stream/http.c b/stream/http.c
index 4cc435e0d0..cd68029025 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -771,7 +771,7 @@ static int http_streaming_start(stream_t *stream, int* file_format) {
else if ( (field_data = http_get_field(http_hdr, "content-type")) != NULL && (!strcmp(field_data, "audio/aacp") || !strcmp(field_data, "audio/aac")))
*file_format = DEMUXER_TYPE_AAC;
else
- *file_format = DEMUXER_TYPE_AUDIO;
+ *file_format = DEMUXER_TYPE_LAVF;
res = STREAM_ERROR;
goto out;
}
diff --git a/stream/network.c b/stream/network.c
index b1212ab5e2..87b295e7e6 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -66,7 +66,7 @@ int network_ipv4_only_proxy = 0;
const mime_struct_t mime_type_table[] = {
// MP3 streaming, some MP3 streaming server answer with audio/mpeg
- { "audio/mpeg", DEMUXER_TYPE_AUDIO },
+ { "audio/mpeg", DEMUXER_TYPE_LAVF },
// ASF
{ "audio/x-ms-wax", DEMUXER_TYPE_ASF },
{ "audio/x-ms-wma", DEMUXER_TYPE_ASF },