virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

http/utils: move mime -> demuxer maping from http to utils

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-09 20:24:49 +01:00
parent 0af7ccd9e2
commit 68bc012190
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/http.c
View File

@ -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;

4
libavformat/utils.c
View File

@ -429,7 +429,9 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
}
if (!*fmt && pb && pb->av_class && av_opt_get(pb, "demuxer", AV_OPT_SEARCH_CHILDREN, &demuxer_name) >= 0 && demuxer_name) {
*fmt = av_find_input_format(demuxer_name);
if (!av_strcasecmp(demuxer_name, "audio/aacp")) {
*fmt = av_find_input_format("aac");
}
}
for(probe_size= PROBE_BUF_MIN; probe_size<=max_probe_size && !*fmt;