summaryrefslogtreecommitdiff
path: root/libavformat/http.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: fix type for thread_type option avconv: move format to options context avconv: move limit_filesize to options context avconv: move start_time, recording_time and input_ts_offset to options context avconv: add a context for options. cmdutils: allow storing per-stream/chapter/.... options in a generic way cmdutils: split per-option code out of parse_options(). cmdutils: add support for caller-provided option context. cmdutils: declare only one pointer type in OptionDef cmdutils: move grow_array() from avconv to cmdutils. cmdutils: move exit_program() declaration to cmdutils from avconv http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes nutenc: add namespace to the api facing functions Conflicts: avconv.c cmdutils.c cmdutils.h ffmpeg.c ffplay.c ffprobe.c ffserver.c libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Consider the stream as seekable if the reply contains Accept-Ranges: bytesStefan Fritsch2011-09-04
| | | | | | | | | | | | | | | | | | | | | | | | The initial request contains "Range: 0-", which servers normally have responded with "HTTP/1.1 206 Partial Content" reply with a Content-Range header, which was used as indicator for seekability. Apache, since 2.2.20, responds with "HTTP/1.1 200 OK" for these requests, which is more friendly to caches and proxies, but the seekability still is indicated via the Accept-Ranges: bytes header. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: use designated initializers for AVClasses.Anton Khirnov2011-05-17
| |
| * AVOptions: make default_val a union, as proposed in AVOption2.Anton Khirnov2011-05-10
| | | | | | | | This breaks API and ABI.
* | http: Fix decetion of range support in HTTP serversStefan Fritsch2011-09-03
| | | | | | | | | | | | | | | | | | | | | | currently libavformat only allows seeking if a request with "Range: 0-" results in a 206 reply from the HTTP server which includes a Content-Range header. But according to RFC 2616, the server may also reply with a normal 200 reply (which is more efficient for a request for the whole file). In fact Apache HTTPD 2.2.20 has changed the behaviour in this way and it looks like this change will be kept in future versions. The fix for libavformat is easy: Also look at the Accept-Ranges header.
* | Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'Michael Niedermayer2011-05-01
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85770f2a2651497861ed938efcd0df3696ff5e45': AVOptions: make default_val a union, as proposed in AVOption2. Move ff_dynarray_add to lavu and make it public. lavf: remove duplicate assignment in avformat_alloc_context. lavf: use designated initializers for AVClasses. options: simplify av_find_opt by using av_next_option. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | AVOptions: make default_val a union, as proposed in AVOption2.Anton Khirnov2011-04-30
| | | | | | | | | | | | This breaks API and ABI.
| * | lavf: use designated initializers for AVClasses.Anton Khirnov2011-04-29
| |/
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Makefile: Include dependencies for test tools, too Remove a version check in av_log made unnecessary by the big bump. update last major version increase dates in APIchanges Reduce picture size for yadif. oggdec: use av_freep() instead of av_free() avio: Fix sanity checks in ffurl_read* libavformat: Free AVFormatContext->streams libavformat: Make protocols pass URLContext as log context where available asf: remove commented out code in asf_read_seek not pulled: libpostproc: Remove crufty code disabled by the big bump. Reflect 0.7_beta1 release in the Changelog not pulled: sws: remove disabled cruft. lavu: remove disabled ff_random_get_seed cruft. lavu: remove disabled sha1 cruft. Conflicts: Changelog libavutil/sha1.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Make protocols pass URLContext as log context where availableMartin Storsjö2011-04-20
| | | | | | | | | | | | | | Since the libavformat major bump, URLContext contains an AVClass, making it a usable log context. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbolsStefano Sabatini2011-04-19
| | | | | | | | | | | | | | | | Make AVIO_FLAG_ access constants work as flags, and in particular fix the behavior of functions (such as avio_check()) which expect them to be flags rather than modes. This breaks API.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: bump minor and add an APIChanges entry for avformat cleanup lavf: get rid of ffm-specific stuff in avformat.h Not pulled: avio: deprecate av_protocol_next(). avio: add a function for iterating though protocol names. lavf: rename a parameter of av_sdp_create from buff->buf lavf: rename avf_sdp_create to av_sdp_create. lavf: make av_guess_image2_codec internal avio: make URLProtocol internal. avio: make URLContext internal. lavf: mark av_pkt_dump(_log) for remove on $next+1 bump. lavf: use designated initializers for all protocols applehttp: don't use deprecated url_ functions. avio: move two ff_udp_* functions from avio_internal to url.h asfdec: remove a forgotten declaration of nonexistent function avio: deprecate the typedef for URLInterruptCB Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: use designated initializers for all protocolsAnton Khirnov2011-04-08
| | | | | | | | | | This is more readable and makes it easier to reorder URLProtocol members.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proto: include os_support.h in network.h matroskaenc: don't write an empty Cues element. lavc: add a FF_API_REQUEST_CHANNELS deprecation macro avio: move extern url_interrupt_cb declaration from avio.h to url.h avio: make av_register_protocol2 internal. avio: avio_ prefix for url_set_interrupt_cb. avio: AVIO_ prefixes for URL_ open flags. proto: introduce listen option in tcp doc: clarify configure features proto: factor ff_network_wait_fd and use it on udp Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-07
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) ac3enc: move extract_exponents inner loop to ac3dsp avio: deprecate url_get_filename(). avio: deprecate url_max_packet_size(). avio: make url_get_file_handle() internal. avio: make url_filesize() internal. avio: make url_close() internal. avio: make url_seek() internal. avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together avio: make url_write() internal. avio: make url_read_complete() internal. avio: make url_read() internal. avio: make url_open() internal. avio: make url_connect internal. avio: make url_alloc internal. applehttp: Merge two for loops applehttp: Restructure the demuxer to use a custom AVIOContext applehttp: Move finished and target_duration to the variant struct aacenc: reduce the number of loop index variables avio: deprecate url_open_protocol avio: deprecate url_poll and URLPollEntry ... Conflicts: libavformat/applehttp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: make url_get_file_handle() internal.Anton Khirnov2011-04-04
| |
| * avio: make url_close() internal.Anton Khirnov2011-04-04
| |
| * avio: make url_write() internal.Anton Khirnov2011-04-04
| |
| * avio: make url_read() internal.Anton Khirnov2011-04-04
| |
| * avio: make url_open() internal.Anton Khirnov2011-04-04
| |
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks. Chronomaster DFA decoder DUPLICATE: framebuffer device demuxer NOT MERGED: cosmetics: fix dashed line length after 070c5d0 http: header field names are case insensitive Conflicts: LICENSE README doc/indevs.texi libavdevice/fbdev.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: header field names are case insensitiveTyler2011-03-28
| | | | | | | | | | | | | | | | | | Amazon S3 sends header field names all lowercase. This is actually acceptable according to the HTTP standard. http://tools.ietf.org/html/rfc2616#section-4.2 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace dprintf with av_dlogLuca Barbato2011-01-29
| | | | | | | | dprintf clashes with POSIX.1-2008
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* | Replace dprintf with av_dlogLuca Barbato2011-01-30
| | | | | | | | | | dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-28
|/ | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
* http: Handle 301/307 redirect requests, tooMike Edenfield2010-11-02
| | | | | | Patch by Mike Edenfield, kutulu at kutulu dot org Originally committed as revision 25651 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move AVOptions from libavcodec to libavutilMichael Niedermayer2010-09-26
| | | | Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the definition of the maximum url size for static buffers to internal.hMartin Storsjö2010-08-19
| | | | Originally committed as revision 24833 to svn://svn.ffmpeg.org/ffmpeg/trunk
* http: Return EOF at the end of the content even if the connection isn't closedMartin Storsjö2010-08-09
| | | | | | We do request Connection: close, but some servers ignore it. Originally committed as revision 24746 to svn://svn.ffmpeg.org/ffmpeg/trunk
* http: Log a warning when receiving an error codeMartin Storsjö2010-07-16
| | | | Originally committed as revision 24266 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ff_url_split() publicMåns Rullgård2010-06-27
| | | | | | | ff_url_split() is retained as an alias, as it was used by ffserver, to avoid breaking ABI compatibility with it. Originally committed as revision 23822 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make the http protocol open the connection immediately in http_open againMartin Storsjö2010-06-22
| | | | | | | Also make the RTSP protocol use url_alloc and url_connect instead of relying on the delay open behaviour. Originally committed as revision 23710 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add an AVClass to the HTTPContextMartin Storsjö2010-06-22
| | | | Originally committed as revision 23709 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allocate the HTTPContext through URLProtocol.priv_data_sizeMartin Storsjö2010-06-22
| | | | Originally committed as revision 23708 to svn://svn.ffmpeg.org/ffmpeg/trunk
* HTTP: Add a method for initializing the authentication state from another ↵Martin Storsjö2010-06-21
| | | | | | connection Originally committed as revision 23685 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentMartin Storsjö2010-06-21
| | | | Originally committed as revision 23684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* HTTP: Compact the code for writing chunked post dataMartin Storsjö2010-06-21
| | | | Originally committed as revision 23683 to svn://svn.ffmpeg.org/ffmpeg/trunk
* HTTP: Get rid of the is_chunked variable, use the chunksize variable insteadMartin Storsjö2010-06-21
| | | | Originally committed as revision 23682 to svn://svn.ffmpeg.org/ffmpeg/trunk
* HTTP: Clarify a commentMartin Storsjö2010-06-21
| | | | Originally committed as revision 23681 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reset chunksize back to zero (= no chunked encoding) after each new openRonald S. Bultje2010-06-20
| | | | | | | | connection (e.g. a seek). This fixes the theoretical case where a server sends a file first using chunked encoding, and then using non-chunked encoding. Originally committed as revision 23665 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use url_write(), not http_write(), for sending the HTTP headers. This preventsRonald S. Bultje2010-06-20
| | | | | | | them from being sent using chunked encoding (I don't think this ever happened, but either way it would be wrong). Originally committed as revision 23664 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make sure the http protocol handler returns errors if a delayed open had failedMartin Storsjö2010-06-09
| | | | Originally committed as revision 23548 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Initialize the http connection in http_seek, tooMartin Storsjö2010-06-09
| | | | | | | | This makes url_fsize return correct values for delay opened connections that have not yet been initialized. This fixes using the image2 demuxer with http sources. Originally committed as revision 23546 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentMartin Storsjö2010-06-08
| | | | Originally committed as revision 23534 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for disabling chunked transfer encoding for the http protocolJosh Allmann2010-06-08
| | | | | | Patch by Josh Allmann, josh dot allmann at gmail Originally committed as revision 23531 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix handling of errors in the http protocolMartin Storsjö2010-06-08
| | | | | | | | | If http_connect fails, we've already stored the new connection handle in s->hd, so clear it so http_close won't double-free it. 10l to me for not spotting it during review Originally committed as revision 23529 to svn://svn.ffmpeg.org/ffmpeg/trunk