summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Add missing libavutil/time.h includes.Anton Khirnov2012-07-286-0/+6
|
* hls: Proceed to the next segment at any error codeMartin Storsjö2012-07-281-2/+0
| | | | | | | | | | | | | Previously, we returned any error code except AVERROR_EOF to the caller - only if AVERROR_EOF or 0 was returned, we proceeded to the next segment. With some setups of web servers, using Connection: close in https and GnuTLS, we don't get a clean error code at the end of segments. In those cases, just proceed to the next segment. Tested-by: Antti Seppälä <[email protected]> Signed-off-by: Martin Storsjö <[email protected]>
* tls: Return AVERROR_EOF if the TLS_read/write functions return 0Martin Storsjö2012-07-281-2/+2
| | | | | | | | | | OpenSSL returns 0 when the peer has closed the connection. GnuTLS doesn't return that though, but returns GNUTLS_E_UNEXPECTED_PACKET_LENGTH if the connection simply is closed without a clean close notify packet. Tested-by: Antti Seppälä <[email protected]> Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Check the buffer length of ping packetsSamuel Pitoiset2012-07-261-0/+12
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Allow having more unknown data at the end of a chunk size packet ↵Samuel Pitoiset2012-07-261-2/+2
| | | | | | without failing Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Prevent reading outside of an allocate buffer when receiving server ↵Samuel Pitoiset2012-07-261-0/+7
| | | | | | bandwidth packets Signed-off-by: Martin Storsjö <[email protected]>
* Support urlencoded http authentication credentialsAntti Seppälä2012-07-265-12/+146
| | | | | | | | | It should be possible to specify usernames in http requests containing urlencoded characters. This patch adds support for decoding the auth strings. Signed-off-by: Antti Seppälä <[email protected]> Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Return an error when the client bandwidth is incorrectSamuel Pitoiset2012-07-251-2/+10
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Return proper error code in handle_server_bwSamuel Pitoiset2012-07-251-1/+1
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Return proper error code in handle_client_bwSamuel Pitoiset2012-07-251-1/+1
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Return proper error codes in handle_chunk_sizeSamuel Pitoiset2012-07-251-2/+2
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Factorize the code by adding handle_invokeSamuel Pitoiset2012-07-251-66/+77
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Factorize the code by adding handle_chunk_sizeSamuel Pitoiset2012-07-251-15/+30
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Factorize the code by adding handle_pingSamuel Pitoiset2012-07-251-4/+16
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Factorize the code by adding handle_client_bwSamuel Pitoiset2012-07-251-8/+18
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Factorize the code by adding handle_server_bwSamuel Pitoiset2012-07-251-6/+17
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Add a new option 'rtmp_pageurl'Samuel Pitoiset2012-07-251-0/+7
| | | | | | | This option specifies the URL of the web page in which the media was embedded. Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Make the description of the rtmp_tcurl option more genericSamuel Pitoiset2012-07-251-1/+1
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* sctp: add port missing error messageJordi Ortiz2012-07-251-1/+5
| | | | | | | Without this patch a user a bit absent-minded may not notice that the connection doesn't work because the port is missing. Signed-off-by: Martin Storsjö <[email protected]>
* tcp: add port missing error messageJordi Ortiz2012-07-251-2/+5
| | | | | | | Without this patch a user a bit absent-minded may not notice that the connection doesn't work because the port is missing. Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE codeMartin Storsjö2012-07-242-0/+4
| | | | | | Our implementation of RTMPE is heavily based on librtmp. Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Move the CONFIG_ condition into the if conditionsSamuel Pitoiset2012-07-241-8/+7
| | | | | | | | This makes sure these calls are removed by dead code elimination even if optimization is disabled. This fixes building without crypto libraries without optimization. Signed-off-by: Martin Storsjö <[email protected]>
* build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabledDiego Biurrun2012-07-241-0/+1
| | | | | The ffrtmpcrypt protocol depends on external libraries, which are also required to compile the header file.
* rtp: Only choose static payload types if the sample rate and channels are rightAdriano Pallavicino2012-07-241-3/+11
| | | | | | | | | If using a different sample rate or number of channels, use a dynamic payload type instead, where the parameters are passed in the SDP. G722 is a special case where the normal rules don't apply. Signed-off-by: Martin Storsjö <[email protected]>
* wav: init st to NULL to avoid a false-positive warning.Clément Bœsch2012-07-231-1/+1
| | | | | | | | | | | | If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which needs a previous 'fmt ' tag to be parsed correctly and st initialized) check will make sure st is never dereferenced in that case. Fixes warning: libavformat/wav.c: In function ‘wav_read_header’: libavformat/wav.c:499:44: warning: ‘st’ may be used uninitialized in this function [-Wmaybe-uninitialized] Signed-off-by: Derek Buitenhuis <[email protected]>
* RTMPTE protocol supportSamuel Pitoiset2012-07-235-6/+54
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* RTMPE protocol supportSamuel Pitoiset2012-07-238-8/+913
| | | | | | | | | | This adds two protocols, but one of them is an internal implementation detail just used as an abstraction layer/generalization in the code. The RTMPE protocol implementation uses ffrtmpcrypt:// as an alternative to the tcp:// protocol. This allows moving most of the lower level logic out from the higher level generic rtmp code. Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Add ff_rtmp_calc_digest_pos()Samuel Pitoiset2012-07-232-10/+27
| | | | | | | This function is used for calculating digest position for RTMP handshake packets. Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it globalSamuel Pitoiset2012-07-232-33/+36
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* lavf: use conditional notation for default codec in muxer declarations.Ronald S. Bultje2012-07-226-57/+18
| | | | | This removes the use of macro nesting in these code constructs, which makes it easier to parse in pre-processors.
* matroskadec: return more correct error code on read error.Anton Khirnov2012-07-221-1/+2
|
* Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxerKostya Shishkov2012-07-221-1/+1
|
* G.723.1 demuxer and decoderMohamed Naufal Basheer2012-07-224-1/+88
| | | | Signed-off-by: Kostya Shishkov <[email protected]>
* rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.Ronald S. Bultje2012-07-214-4/+4
| | | | | | | This makes usage of the macro look more natural when used with array entries. Signed-off-by: Derek Buitenhuis <[email protected]>
* mpegenc: remove disabled codeDiego Biurrun2012-07-211-116/+0
|
* cafdec: allow larger ALAC magic cookieJustin Ruggles2012-07-191-1/+1
| | | | | It already skips any extra bytes at the end, and apparently there are some samples in the wild with larger 'kuki' chunks.
* avformat: move 'chan' tag parsing to mov_chan.c to share with the CAF demuxerJustin Ruggles2012-07-194-47/+63
|
* caf: use int64_t for num_packetsJustin Ruggles2012-07-191-2/+2
| | | | It is used to store a value read by avio_rb64().
* caf: fix 'pakt' chunk parsingJustin Ruggles2012-07-191-2/+3
| | | | | | according to the CAF specification: "... the value for mChunkSize can be greater than the actual valid content of the packet table chunk"
* caf: support either old or new style ALAC magic kuki chunkJustin Ruggles2012-07-191-4/+26
|
* os_support: K&R formatting cosmeticsDiego Biurrun2012-07-171-49/+71
|
* RTMPTS protocol supportSamuel Pitoiset2012-07-175-7/+57
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* RTMPS protocol supportSamuel Pitoiset2012-07-175-1/+27
| | | | Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: Rename rtmphttp to ffrtmphttpSamuel Pitoiset2012-07-174-5/+5
| | | | | | | The prefix makes it easier to distinguish the proper end-user protocols from the internal ones. Signed-off-by: Martin Storsjö <[email protected]>
* rtmp: rtmp_parse_result() add case for video and audio packets to avoid ↵Jordi Ortiz2012-07-161-0/+4
| | | | | | undesired debug output. Signed-off-by: Kostya Shishkov <[email protected]>
* mpeg: remove disabled codeDiego Biurrun2012-07-161-41/+0
|
* network: Always use our version of gai_strerror on windowsMartin Storsjö2012-07-152-2/+6
| | | | | | | | Even if linking directly to getaddrinfo, use our version of gai_strerror instead of the system's version. Microsoft explicitly documents that their version of gai_strerror is thread-unsafe. Signed-off-by: Martin Storsjö <[email protected]>
* network: Undefine existing gai_strerror definitionsMartin Storsjö2012-07-151-0/+1
| | | | | | | | | | | This avoids warnings if there already exists a definition. This is the case on windows, where the getaddrinfo isn't available and linked to (and we use our fallbacks instead, which actually try to use the proper getaddrinfo version if found at runtime), but gai_strerror still exists as a define. Signed-off-by: Martin Storsjö <[email protected]>
* network: Extend the fallback gai_strerror implementation to handle more ↵Martin Storsjö2012-07-152-2/+26
| | | | | | | | | error codes This is useful if a proper getaddrinfo is loaded dynamically on windows, while using the fallback implementation of gai_strerror. Signed-off-by: Martin Storsjö <[email protected]>
* build: Fix APE tag dependenciesDiego Biurrun2012-07-131-4/+4
|