diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 20:24:49 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 20:24:49 +0100 |
commit | 68bc012190f9732a0f103fdd08f9bc63edc1c74d (patch) | |
tree | b96b018bacfcb722b337dd06a56a3338052d67c5 /libavformat/http.c | |
parent | 0af7ccd9e2689e5ae1a4532907b6d7c2e169ebb9 (diff) | |
download | ffmpeg-68bc012190f9732a0f103fdd08f9bc63edc1c74d.tar.gz |
http/utils: move mime -> demuxer maping from http to utils
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.c')
-rw-r--r-- | libavformat/http.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 06e0d39930..0d71726453 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -357,10 +357,8 @@ static int process_line(URLContext *h, char *line, int line_count, s->willclose = 1; } else if (!av_strcasecmp (tag, "Server") && !av_strcasecmp (p, "AkamaiGHost")) { s->is_akamai = 1; - } else if (!av_strcasecmp (tag, "Content-Type")) { - if (!av_strcasecmp (p, "audio/aacp")) { - av_free(s->demuxer); s->demuxer = av_strdup("aac"); - } + } else if (!av_strcasecmp (tag, "Content-Type") && p) { + av_free(s->demuxer); s->demuxer = av_strdup(p); } } return 1; |