Mercurial > mplayer.hg
changeset 30357:3fdf04500df2
Handle Content-Length also when Content-Type is not set.
Based on patch by Yuriy Kaminskiy [yumkam mail ru]
| author | reimar |
|---|---|
| date | Sat, 23 Jan 2010 11:14:18 +0000 |
| parents | 5cd7eb2e34c0 |
| children | 26d336c4a7a4 |
| files | stream/http.c |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/http.c Sat Jan 23 11:08:45 2010 +0000 +++ b/stream/http.c Sat Jan 23 11:14:18 2010 +0000 @@ -743,6 +743,7 @@ int auth_retry=0; int seekable=0; char *content_type; + const char *content_length; char *next_url; URL_t *url = stream->streaming_ctrl->url; @@ -816,15 +817,15 @@ // Assume standard http if not ICY switch( http_hdr->status_code ) { case 200: // OK + content_length = http_get_field(http_hdr, "Content-Length"); + if (content_length) { + mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", content_length); + stream->end_pos = atoll(content_length); + } // Look if we can use the Content-Type content_type = http_get_field( http_hdr, "Content-Type" ); if( content_type!=NULL ) { - char *content_length = NULL; mp_msg(MSGT_NETWORK,MSGL_V,"Content-Type: [%s]\n", content_type ); - if( (content_length = http_get_field(http_hdr, "Content-Length")) != NULL) { - mp_msg(MSGT_NETWORK,MSGL_V,"Content-Length: [%s]\n", http_get_field(http_hdr, "Content-Length")); - stream->end_pos = atoll(content_length); - } // Check in the mime type table for a demuxer type i = 0; while(mime_type_table[i].mime_type != NULL) {