RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
74,423 Commits 36 Branches 392 Tags 316 MiB
Commit Graph

157 Commits

Author SHA1 Message Date
Stephan Holljes 1d46e0ee05 doc/protocols: document experimental mutli-client api 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Zhang Rui f477a3f5ab avformat/async: support filling with a background thread. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 01:46:50 +02:00
Stephan Holljes aa74401af8 lavf/http: Document method option. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-06-06 09:13:41 +02:00
Stephan Holljes b51027fd18 libavformat/http.c: Make http-listen work as an input stream. 
With this patch http can be used to listen for POST data to be used as an input stream.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-11 23:10:44 +02:00
Stephan Holljes 4a58d757de lavf/http: add proof-of-concept http server. 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Reviewed-By: Nicolas George <george@nsup.org>
 2015-04-05 10:17:47 +02:00
Tobias Rapp 5be04f9789 doc/protocols: Fixed missing example section marker 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-17 15:04:22 +01:00
Andreas Cadhalpun 482c86f231 fix spelling errors 
opttimizations -> optimizations
 grabing        -> grabbing
 many resource  -> many resources
 isnt           -> isn't
 silcense       -> silence

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-06 21:35:00 +01:00
Stefano Sabatini 6db20926c3 doc/protocols/tcp: fix units of listen_timeout option value, from microseconds to milliseconds 
s->listen_timeout is passed to ff_listen_bind(), which accepts a timeout
value expressed in milliseconds.

The unit was incorrectly set in 1b4da43ce0.
 2015-03-05 12:13:25 +01:00
Michael Niedermayer 230aeee94c doc: fix the the typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-22 02:09:09 +01:00
Michael Niedermayer 313d75cd43 Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14' 
* commit '7e38903b5c86a759549e70647ae42bb22d353b14':
  http: enable icy metadata by default.

Conflicts:
	Changelog
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-13 22:54:31 +02:00
Andrew Stone 7e38903b5c http: enable icy metadata by default. 
It won't hurt servers that don't care about the header,
and those that do will include it by default.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-13 16:10:15 +00:00
Michael Niedermayer 491c52d3b0 Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 
* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
  Add Icecast protocol

Conflicts:
	Changelog
	configure
	doc/protocols.texi
	libavformat/icecast.c
	libavformat/version.h

See: e3dc2c86fc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 14:14:13 +02:00
ePirat e3dc2c86fc libavformat: Add Icecast protocol 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 13:33:44 +02:00
Marvin Scholz eb9244f202 Add Icecast protocol 
Icecast is basically a convenience wrapper around the HTTP protocol.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-08-04 12:56:42 +03:00
Andreas Cadhalpun e59ce54412 doc: fix two spelling errors 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-20 23:58:36 +02:00
Lukasz Marek 4cc0f79a2c lavf: add samba protocol via libsmbclient 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 20:38:55 +02:00
Lukasz Marek 362cfe8ce1 doc/protocols: document unit of timeouts for ftp and http 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-07-05 12:07:11 +02:00
Moritz Barsnick 10b8481a26 fix several typos 2014-06-20 10:21:31 -08:00
Olivier Langlois af31d58a63 doc: Add udp broadcast option description 
Describe the option added in commit f1c167496e

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-15 20:52:42 +02:00
rogerdpack 4d9881e1cc udp: mention default in documentation 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-25 17:53:14 +01:00
rogerdpack 3eafe1d71c udp: try to clarify verbiage on buffer_size 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-22 16:46:06 +01:00
Michael Niedermayer 675a66a93b doc: switch github urls to https 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:05:26 +01:00
Michael Niedermayer cd25412f59 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  http: Allow setting a Content-Type for POST requests

Conflicts:
	libavformat/http.c

See: c01d1d4ddf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 04:53:54 +01:00
Michael Niedermayer 0d487654ea Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4' 
* commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4':
  http: Improve options descriptions

Conflicts:
	doc/protocols.texi
	libavformat/http.c

See: 255ec768da
See: 0a7cd74043
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 04:43:21 +01:00
Michael Niedermayer 76a939d0e5 Merge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319' 
* commit '2ec33d27127251bbc45e1f88e60691ad59cf2319':
  http: Add support for selecting a request range

Conflicts:
	doc/protocols.texi
	libavformat/http.c

See: d52882faef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 04:12:30 +01:00
Michael Niedermayer f36da16ede Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f' 
* commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f':
  http: Support setting custom User-Agent

Conflicts:
	doc/protocols.texi
	libavformat/http.c

See: 2bb1c713cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 03:45:16 +01:00
Michael Niedermayer c03af3ac1c Merge commit 'e58c85b0686892960042232e51c77168b264838a' 
* commit 'e58c85b0686892960042232e51c77168b264838a':
  http: Export Content-Type information

Conflicts:
	doc/protocols.texi
	libavformat/http.c

See: 76d851b656
See: 20899c54f0
See: 255ec768da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 03:33:14 +01:00
Michael Niedermayer ca2369cdee Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab' 
* commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab':
  http: Add support reading ICY metadata

Conflicts:
	doc/protocols.texi
	libavformat/http.c

See: a92fbe16f2
See: 636273d3d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 03:18:12 +01:00
Clément Bœsch 2572d07c1f http: Allow setting a Content-Type for POST requests 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-11 22:08:57 +01:00
Alessandro Ghedini fe568b3d27 http: Improve options descriptions 
Add documentation where missing.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-11 22:08:57 +01:00
Anssi Hannula 2ec33d2712 http: Add support for selecting a request range 
Comment from Reimar Döffinger included as pro memoria.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-11 22:08:57 +01:00
Clément Bœsch ddfc989063 http: Support setting custom User-Agent 
Contextually make the default User-Agent use the common
"Name/Version" pattern.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-11 22:08:57 +01:00
Michael Niedermayer e58c85b068 http: Export Content-Type information 
Bug-Id: https://bugs.debian.org/740421

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-11 22:08:57 +01:00
Luca Barbato 8075c3d8bb http: Add support reading ICY metadata 
Export the metadata as a icy_metadata_packet avoption.
Based on the work of wm4 and Alessandro Ghedini.

Bug-Id: https://bugs.debian.org/739936

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-11 22:08:57 +01:00
Nicolas George 97e87e09c8 lavf: add subfile protocol. 2014-03-08 12:36:57 +01:00
Andreas Cadhalpun 9898bd9a82 Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 21:12:40 +01:00
Andrey Utkin bc764d786f Add "prefer_tcp" flag to "rtsp_flags" 
If set, and if TCP is available as RTSP RTP transport, then TCP will be
tried first as RTP transport.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-04 22:54:13 +01:00
Lukasz Marek 7e8f304846 lavf/libssh: add private_key option 
Allows to specify private key to use during authorization.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-01-22 00:41:13 +01:00
Stefano Sabatini 92e145acbb doc/protocols/file: fix semantical reverse 
Change "read" to "write" in introductory description.

Spotted-by: Alexander Strasser <eclipse7@gmx.net>
 2014-01-05 00:43:51 +01:00
Stefano Sabatini 98ecbf0093 doc/protocols/file: document general file protocol URL syntax 
Also drop confusing ff* tools reference about exceptions to the
file:FILENAME syntax, which is not ff* tool specific.

With various edits by Alexander Strasser <eclipse7@gmx.net>.
 2014-01-05 00:43:51 +01:00
Stefano Sabatini 8c8c3ca91e doc/protocols/rtsp, lavf/rtsp: fix/extend options documentation 2014-01-01 12:57:15 +01:00
Stefano Sabatini 8ea1501878 doc/protocols: fix level of udp examples subsection 2013-12-27 12:43:35 +01:00
Stefano Sabatini 1b4da43ce0 doc/protocols/tcp,lavf/tcp: apply minor fixes to TCP protocol documentation 2013-12-25 18:42:26 +01:00
Stefano Sabatini b80cf46090 doc/protocols/udp,lavf/udp: apply minor documentation fixes 2013-12-25 18:42:15 +01:00
Stefano Sabatini d3aa04b150 doc/protocols/rtp: apply misc fixes 
Partially suggested-by Burek Pekaric <burek021@gmail.com>.
 2013-10-27 12:44:48 +01:00
burek 229042a52d doc/protocols: add description for the RTP protocol 
With some edits by Stefano.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-24 21:19:45 +02:00
Michael Niedermayer f31c36e552 Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93' 
* commit '705b748e8d8612385c96428ae36ed0d42a170d93':
  tls: Add support for listen mode

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: 4f4eb380f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-27 11:33:19 +02:00
Michael Niedermayer e6e71fd7b5 Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c' 
* commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c':
  tls: Add options for verifying the peer certificate

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

See: b2460858f6
See: 973a758f52
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-27 09:33:28 +02:00
Martin Storsjö 705b748e8d tls: Add support for listen mode 
Also add options for specifying a certificate and key, which can
be used both when operating as client and as server.

Partially based on a patch by Peter Ross.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-26 23:13:35 +03:00
Martin Storsjö 8b09d917e7 tls: Add options for verifying the peer certificate 
A file containing the trusted CA certificates needs to be
supplied via the ca_file AVOption, unless the TLS library
has got a system default file/database set up.

This doesn't check the hostname of the peer certificate with
openssl, which requires a non-trivial piece of code for
manually matching the desired hostname to the string provided
by the certificate, not provided as a library function.

That is, with openssl, this only validates that the received
certificate is signed with the right CA, but not that it is
the actual server we think we're talking to.

Verification is still disabled by default since we can't count
on a proper CA database existing at all times.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-26 23:13:06 +03:00