generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'

Browse Source 
* commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c':
  http: Drop doxy comments

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-12 02:39:46 +01:00
parent 03fd80dcb1 78b21c1d71
commit b752d02f42
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/http.c
View File

@@ -49,7 +49,8 @@ typedef struct {
unsigned char buffer[BUFFER_SIZE], *buf_ptr, *buf_end; unsigned char buffer[BUFFER_SIZE], *buf_ptr, *buf_end;
int line_count; int line_count;
int http_code; int http_code;
int64_t chunksize; /**< Used if "Transfer-Encoding: chunked" otherwise -1. */ /* Used if "Transfer-Encoding: chunked" otherwise -1. */
int64_t chunksize;
char *content_type; char *content_type;
char *user_agent; char *user_agent;
int64_t off, filesize, req_end_offset; int64_t off, filesize, req_end_offset;
@@ -59,12 +60,17 @@ typedef struct {
HTTPAuthState auth_state; HTTPAuthState auth_state;
HTTPAuthState proxy_auth_state; HTTPAuthState proxy_auth_state;
char *headers; char *headers;
int willclose; /**< Set if the server correctly handles Connection: close and will close the connection after feeding us the content. */ /* Set if the server correctly handles Connection: close and will close
* the connection after feeding us the content. */
int willclose;
int seekable; /**< Control seekability, 0 = disable, 1 = enable, -1 = probe. */ int seekable; /**< Control seekability, 0 = disable, 1 = enable, -1 = probe. */
int chunked_post; int chunked_post;
int end_chunked_post; /**< A flag which indicates if the end of chunked encoding has been sent. */ /* A flag which indicates if the end of chunked encoding has been sent. */
int end_header; /**< A flag which indicates we have finished to read POST reply. */ int end_chunked_post;
int multiple_requests; /**< A flag which indicates if we use persistent connections. */ /* A flag which indicates we have finished to read POST reply. */
int end_header;
/* A flag which indicates if we use persistent connections. */
int multiple_requests;
uint8_t *post_data; uint8_t *post_data;
int post_datalen; int post_datalen;
int is_akamai; int is_akamai;