summaryrefslogtreecommitdiff
path: root/libavformat/network.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-081-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avformat: Avoid a warning about mixed declarations and code BMV demuxer and decoder matroskaenc: Make sure the seekhead struct is freed even on seek failure mpeg12enc: Remove write-only variables. mpeg12enc: Don't set up run-level info for level 0. msmpeg4: Don't set up run-level info for level 0. avformat: Warn about using network functions without calling avformat_network_init avformat: Revise wording rdt: Set AVFMT_NOFILE on ff_rdt_demuxer rdt: Check the return value of avformat_open rtsp: Discard the dynamic handler, if it has an alloc function which failed dsputil: use cpuflags in x86 versions of vector_clip_int32() Conflicts: libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Warn about using network functions without calling ↵Martin Storsjö2011-11-071-0/+1
| | | | | | | | | | | | | | | | | | avformat_network_init This is to make developers aware of the fact that they will start using the new init function at some point. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-061-49/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: http: Remove the custom function for disabling chunked posts rtsp: Disable chunked http post through AVOptions movdec: Set frame_size for AMR h264_weight: remove duplication functions. swscale: align vertical filtersize by 2 on x86. libavfilter: reindent. matroskadec: empty blocks are in fact valid. avfilter: don't abort() on zero-size allocations. h264: improve calculation of codec delay. movenc: Set a correct packet size for AMR-NB mode 15, "no data" avformat: Add functions for doing global network initialization avformat: Add the https protocol avformat: Add the tls protocol, using OpenSSL or gnutls avformat: Initialize gnutls in ff_tls_init() w32threads: Wrap the mutex functions in inline functions returning int configure: Allow linking to the gnutls library avformat: Add ff_tls_init()/deinit() that initialize OpenSSL configure: Allow linking to openssl avcodec: Allow locking and unlocking an avformat specific mutex avformat: Split out functions from network.h to a new file, network.c Conflicts: Changelog configure doc/APIchanges libavcodec/internal.h libavcodec/version.h libavfilter/formats.c libavformat/matroskadec.c libavformat/mov.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Add ff_tls_init()/deinit() that initialize OpenSSLMartin Storsjö2011-11-051-0/+3
| | | | | | | | | | | | | | If the application hasn't set up mutex callbacks, we set up our own using pthreads (or w32pthreads). Signed-off-by: Martin Storsjö <martin@martin.st>
| * avformat: Split out functions from network.h to a new file, network.cMartin Storsjö2011-11-051-49/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-051-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: remove MULL inline asm mathops: use MUL64 macro where it forms part of other ops tty: factorise returning error codes. rawdec: add framerate private option. x11grab: add framerate private option. fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base. bktr: don't error when AVFormatParameters.time_base isn't set. cmdutils: add missing const qualifier Skip headers not designed to work standalone during 'make checkheaders'. Add missing #includes to make headers self-contained. musepack: remove unnecessary #include from mpcdata.h musepack: remove extraneous mpcdata.h inclusions Fix error check in av_file_map() Conflicts: cmdutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add missing #includes to make headers self-contained.Diego Biurrun2011-06-041-0/+3
| | | | | | | | This fixes 'make checkheaders'.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-271-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) ARM: add ARMv6 optimised av_clip_uintp2 ARM: remove volatile from asm statements in libavutil/intmath ARM: fix av_clipl_int32_arm() v4l: include avdevice.h ffserver: move close_connection() call to avoid a temporary string and copy. lavf: initialize demuxer private options. AVOptions: set string default values. lavdevice: mark v4l for removal on next major bump. swscale: fix compile on ppc. swscale: fix compile on x86-32. build: Remove generated .version file on distclean. configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2. doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected. ffplay: Remove disabled code. Mark parameterless function declarations as 'void'. swscale: use av_clip_uint8() in yuv2yuv1_c(). swscale: remove VOF/VOFW. swscale: split chroma buffers into separate U/V planes. swscale: replace formatConvBuffer[VOF] by allocated array. rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Mark parameterless function declarations as 'void'.Diego Biurrun2011-05-261-1/+2
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-291-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: LOTS of duplicates ... avio: Fix the deprecated fallback URL-prefixed open flags avoid duplicate -lm in .pc files mpeg12: terminate mpeg2_video_profiles arrays network: Check POLLERR and POLLHUP in ff_network_wait_fd mpegtsenc: make PMT PID really start on pmt_start_pid nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE rawvideo codec: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation Conflicts: configure libswscale/swscale.h tests/ref/lavf/ts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * network: Check POLLERR and POLLHUP in ff_network_wait_fdGil Pedersen2011-04-281-1/+1
| | | | | | | | | | | | | | | | Previously, the function would lead to an infinite wait (by returning AVERROR(EAGAIN)) on sockets indicating an error via either of these poll flags. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-081-0/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * proto: include os_support.h in network.hLuca Barbato2011-04-071-0/+1
| | | | | | | | Fix compilation on systems without poll()
| * proto: factor ff_network_wait_fd and use it on udpLuca Barbato2011-04-071-0/+13
| | | | | | | | | | | | | | | | Support the URL_FLAG_NONBLOCK semantic and uniform the protocol. The quick retry loop is already part of retry_transfer_wrapper. The polling routine is common to the network protocols: udp, tcp and, once merged, sctp.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-5/+5
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * libavformat: Remove FF_NETERRNO()Martin Storsjö2011-02-231-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR() error codes. Provide fallback definitions of other errno.h network errors, mapping them to the corresponding winsock errors. This eases catching these error codes in common code, without having to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN). This fixes roundup issue 2614, unbreaking blocking network IO on windows. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | libavformat: Remove FF_NETERRNO()Martin Storsjö2011-02-231-4/+15
|/ | | | | | | | | | | | | | | Map EAGAIN and EINTR from ff_neterrno to the normal AVERROR() error codes. Provide fallback definitions of other errno.h network errors, mapping them to the corresponding winsock errors. This eases catching these error codes in common code, without having to distinguish between FF_NETERRNO(EAGAIN) and AVERROR(EAGAIN). This fixes roundup issue 2614, unbreaking blocking network IO on windows. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 28c4741a6617a4c1d2490cb13fc70ae4c9c472da)
* Convert ff_is_multicast_address to take a struct sockaddr parameterMartin Storsjö2010-10-071-3/+3
| | | | | | | | Not all users of this function will have a full struct sockaddr_storage available, and casting other sockaddrs to sockaddr_storage is wrong, while any sockaddr can be cast to a base sockaddr. Originally committed as revision 25388 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Share the is_multicast_address functionMartin Storsjö2010-10-071-0/+14
| | | | | | | | The header probably isn't the right permanent place for this function, but it is quite small, and consensus seems to be that it can stay in the header for now, instead of creating a new file network.c just for this one. Originally committed as revision 25387 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move multicast address identification fallback macros to network.h from udp.cMartin Storsjö2010-10-071-0/+7
| | | | Originally committed as revision 25386 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move INET6_ADDRSTRLEN to network.h, similar to other network-related fixupsRonald S. Bultje2010-09-031-0/+4
| | | | | | | for broken OSes. This is included in rtsp.h, as opposed to os_support.h. Should fix OS/2 broken build on fate. Originally committed as revision 25035 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix compile error on mingw where ETIMEDOUT is missing (because it's a WSA ↵Ronald S. Bultje2010-04-151-4/+4
| | | | | | | | | error). This patch also changes FF_NETERROR() to be an AVERROR(), i.e. it is always negative, whereas it was previously positive. Originally committed as revision 22887 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Localize the #define _SVID_SOURCE needed for inet_aton() to os_support.cDavid Conrad2010-03-071-4/+1
| | | | Originally committed as revision 22284 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement gai_strerror() for systems lacking such functionality. PatchRonald S. Bultje2010-02-081-0/+2
| | | | | | by KO Myung-Hun <komh challion net>. Originally committed as revision 21692 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use the configure check from r21351 and use it to properly define structMartin Storsjö2010-01-201-1/+9
| | | | | | | | | sockaddr (in case it's not missing) so it always works on the system that we are defining it for, in a RFC-2553/3493-compliant way (i.e. containing a ss_family field). which is used in udp.c. Patch by Martin Storsjö <$firstname $firstname st>. Originally committed as revision 21352 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Provide a fallback for getnameinfo() also. Patch by Martin StorsjöMartin Storsjö2010-01-111-0/+32
| | | | | | <$firstname()$firstname,st>. Originally committed as revision 21150 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement a fallback for struct sockaddr_storage if not available.Martin Storsjö2010-01-111-0/+6
| | | | | | Patch by Martin Storsjö <$firstname()$firstname,st>. Originally committed as revision 21149 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Provide fallback implementations of getaddrinfo() and freeaddrinfo().Martin Storsjö2010-01-111-0/+38
| | | | | | Patch by Martin Storsjö <$firstname()$firstname,st>. Originally committed as revision 21145 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix undefined preprocessor directives warnings during 'make checkheaders'.Diego Biurrun2009-01-241-0/+2
| | | | Originally committed as revision 16747 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs2009-01-131-5/+5
| | | | | | They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-171-3/+3
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add initialization and cleanup functions for WinsockRamiro Polla2007-08-091-0/+17
| | | | Originally committed as revision 10040 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check for winsock2.h instead of __MINGW32__Ramiro Polla2007-08-081-1/+1
| | | | Originally committed as revision 9988 to svn://svn.ffmpeg.org/ffmpeg/trunk
* initial mingw networking supportAlex Beregszaszi2007-05-151-3/+13
| | | | Originally committed as revision 9029 to svn://svn.ffmpeg.org/ffmpeg/trunk
* implement ff_socket_nonblock and use it in networking codeAlex Beregszaszi2007-04-271-0/+2
| | | | Originally committed as revision 8846 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use ff_neterrno() and FF_NETERROR() for networking error handlingAlex Beregszaszi2007-04-271-0/+3
| | | | Originally committed as revision 8845 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Some more BeOS cleanup: check for arpa/inet.h; declare the prototype for ↵François Revol2007-03-231-0/+7
| | | | | | inet_aton if not found; remove barpainet.h as it's not longer needed. Originally committed as revision 8488 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move networking #includes into separate fileRamiro Polla2007-02-041-0/+30
patch by Ramiro Polla angustia =a= arrozcru =d= no-ip =d= org Originally committed as revision 7817 to svn://svn.ffmpeg.org/ffmpeg/trunk