diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 18:41:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 19:12:34 +0100 |
| commit | 76d851b65619e5a0fe4cc5248a6858287fe890b4 (patch) | |
| tree | 9ed4c17c5d5829dca291b3212053342a8db69861 | |
| parent | 160013736e40744989c8fc7dd1000980d00cf02d (diff) | |
| download | ffmpeg-76d851b65619e5a0fe4cc5248a6858287fe890b4.tar.gz | |
http: export ICY content type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/http.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 308c22dd90..06e0d39930 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -63,6 +63,7 @@ typedef struct { int post_datalen; int is_akamai; int rw_timeout; + char *demuxer; } HTTPContext; #define OFFSET(x) offsetof(HTTPContext, x) @@ -78,6 +79,7 @@ static const AVOption options[] = { {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E }, {"post_data", "custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E }, {"timeout", "timeout of socket i/o operations", OFFSET(rw_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, D|E }, +{"demuxer", "", OFFSET(demuxer), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 }, {NULL} }; #define HTTP_CLASS(flavor)\ @@ -355,6 +357,10 @@ 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"); + } } } return 1; |