diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2007-02-11 12:37:28 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-02-11 12:37:28 +0000 |
| commit | c964c2c7458e2c3c147f44c3a08c8cd6f45ec80b (patch) | |
| tree | b93d55be1a16ac1751335c731f9ac71f675433e1 /libavformat/avformat.h | |
| parent | b7d3bfa6d3f54193424ec181f889683483ced8f8 (diff) | |
| download | ffmpeg-c964c2c7458e2c3c147f44c3a08c8cd6f45ec80b.tar.gz | |
add key field to AVFormatContext for de/encryption support, patch by Reimar
Originally committed as revision 7924 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 79f76ccc10..876799de7a 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -25,8 +25,8 @@ extern "C" { #endif -#define LIBAVFORMAT_VERSION_INT ((51<<16)+(8<<8)+0) -#define LIBAVFORMAT_VERSION 51.8.0 +#define LIBAVFORMAT_VERSION_INT ((51<<16)+(9<<8)+0) +#define LIBAVFORMAT_VERSION 51.9.0 #define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT #define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION) @@ -379,6 +379,9 @@ typedef struct AVFormatContext { * maximum duration in AV_TIME_BASE units over which the input should be analyzed in av_find_stream_info() */ int max_analyze_duration; + + const uint8_t *key; + int keylen; } AVFormatContext; typedef struct AVPacketList { |