har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,609 Commits 2 Branches 401 Tags
Commit Graph

17 Commits

Author SHA1 Message Date
Michael Niedermayer
2d0117f816 avformat/crypto: fix key vs iv typo 
Fixes Ticket 4167

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 19:58:56 +01:00
Michael Niedermayer
24e7e0237b avformat/crypto: Use av_memdup() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-02 02:01:11 +01:00
Christian Suloway
00d4013d9f avformat/crypto: added encryption 
Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-02 01:46:10 +01:00
Thilo Borgmann
d814a839ac Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
Michael Niedermayer
f391e405df Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 
* commit 'e002e3291e6dc7953f843abf56fc14f08f238b21':
  Use the new aes/md5/sha/tree allocation functions
  avutil: Add functions for allocating opaque contexts for algorithms
  svq3: fix pointer type warning
  svq3: replace unsafe pointer casting with intreadwrite macros
  parseutils-test: various cleanups

Conflicts:
	doc/APIchanges
	libavcodec/svq3.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-12 14:52:34 +02:00
Martin Storsjö
e002e3291e Use the new aes/md5/sha/tree allocation functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-10-11 23:35:28 +03:00
Duncan Salerno
f3f35f7430 crypto should allow passing of options to the underlying protocol via the url_open2 interface 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 22:52:25 +02:00
Martin Storsjö
12c8912de2 crypto: Remove a stray double space 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-08-31 23:27:27 +02:00
Anton Khirnov
ddffc2fdc3 avio: add support for passing options to protocols. 
Not used anywhere yet, support for passing options from avio_open() will
follow.
 2011-11-13 13:14:39 +01:00
Martin Storsjö
6f1b7b3944 avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc 
Change all uses of these function to pass the relevant
callback on.
 2011-11-13 13:12:17 +01:00
Anton Khirnov
dc86ca1ab5 crypto: add decoding flag to options. 2011-11-10 11:37:38 +01:00
Martin Storsjö
eaa8c1f9fe crypto: Don't manually free memory allocated via AVOptions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-11-10 10:51:13 +02:00
Anton Khirnov
145f741e11 AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* 2011-10-12 16:51:16 +02:00
Etienne Buira
a71bcd1a7f crypto: Use av_freep instead of av_free 
This fixes a potential double free.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-06-08 23:41:53 +03:00
Anton Khirnov
f0029cbcf6 lavf: use designated initializers for AVClasses. 2011-05-17 23:01:42 +02:00
Martin Storsjö
ac9cf2e5c4 crypto: Use av_freep instead of av_free 
Using av_freep is generally good practice.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-04-24 21:30:03 +03:00
Martin Storsjö
6e4f70a8de Add a protocol handler for AES CBC decryption with PKCS7 padding 
This can later be extended to support other AES bit sizes,
encryption, other crypto algorithms, reading the key from a URL, etc.

In order to use it, the key and initialization vector has to be
passed via AVOptions. Since such options can't be passed to
protocols from the command line, the protocol is currently
only for libavformat internal use.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-04-23 00:27:10 +03:00