[FFmpeg-cvslog] Document "crypto" protocol

Andrey Utkin git at videolan.org
Thu Jun 20 03:08:08 CEST 2013


ffmpeg | branch: master | Andrey Utkin <andrey.krieger.utkin at gmail.com> | Wed Jun 19 08:17:58 2013 +0300| [f9739a34ad53b05b8a02afdc589f241e425351f8] | committer: Michael Niedermayer

Document "crypto" protocol

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f9739a34ad53b05b8a02afdc589f241e425351f8
---

 doc/protocols.texi |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 911e555..6d88344 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -85,6 +85,25 @@ ffplay concat:split1.mpeg\|split2.mpeg\|split3.mpeg
 Note that you may need to escape the character "|" which is special for
 many shells.
 
+ at section crypto
+
+AES-encrypted stream reading protocol.
+
+The accepted options are:
+ at table @option
+ at item key
+Set the AES decryption key binary block from given hexadecimal representation.
+
+ at item iv
+Set the AES decryption initialization vector binary block from given hexadecimal representation.
+ at end table
+
+Accepted URL formats:
+ at example
+crypto:@var{URL}
+crypto+ at var{URL}
+ at end example
+
 @section data
 
 Data in-line in the URI. See @url{http://en.wikipedia.org/wiki/Data_URI_scheme}.



More information about the ffmpeg-cvslog mailing list