Commit c964c2c7 authored by Reimar Döffinger's avatar Reimar Döffinger Committed by Baptiste Coudurier

add key field to AVFormatContext for de/encryption support, patch by Reimar

Originally committed as revision 7924 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b7d3bfa6
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
extern "C" { extern "C" {
#endif #endif
#define LIBAVFORMAT_VERSION_INT ((51<<16)+(8<<8)+0) #define LIBAVFORMAT_VERSION_INT ((51<<16)+(9<<8)+0)
#define LIBAVFORMAT_VERSION 51.8.0 #define LIBAVFORMAT_VERSION 51.9.0
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT #define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION) #define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
...@@ -379,6 +379,9 @@ typedef struct AVFormatContext { ...@@ -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() * maximum duration in AV_TIME_BASE units over which the input should be analyzed in av_find_stream_info()
*/ */
int max_analyze_duration; int max_analyze_duration;
const uint8_t *key;
int keylen;
} AVFormatContext; } AVFormatContext;
typedef struct AVPacketList { typedef struct AVPacketList {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment