virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'

Browse Source 
* commit '5d8bea3bb2357bb304f8f771a4107039037c5549':
  xtea: add av_xtea_alloc()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-08-02 10:39:37 +02:00
parent 52566efd5c 5d8bea3bb2
commit 9ca19971bc
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/APIchanges
View File

@@ -18,6 +18,7 @@ API changes, most recent first:
2015-xx-xx - lavu 54.30.0 2015-xx-xx - lavu 54.30.0
xxxxxxx - Add av_blowfish_alloc(). xxxxxxx - Add av_blowfish_alloc().
xxxxxxx - Add av_rc4_alloc(). xxxxxxx - Add av_rc4_alloc().
xxxxxxx - Add av_xtea_alloc().
2015-xx-xx - lavc 56.35.0 - avcodec.h 2015-xx-xx - lavc 56.35.0 - avcodec.h
xxxxxxxxx - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*. xxxxxxxxx - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*.

12
libavutil/xtea.c
View File

@@ -31,8 +31,20 @@
#include "avutil.h" #include "avutil.h"
#include "common.h" #include "common.h"
#include "intreadwrite.h" #include "intreadwrite.h"
#include "mem.h"
#include "xtea.h" #include "xtea.h"
#if !FF_API_CRYPTO_CONTEXT
struct AVXTEA {
uint32_t key[16];
};
#endif
AVXTEA *av_xtea_alloc(void)
{
return av_mallocz(sizeof(struct AVXTEA));
}
void av_xtea_init(AVXTEA *ctx, const uint8_t key[16]) void av_xtea_init(AVXTEA *ctx, const uint8_t key[16])
{ {
int i; int i;

10
libavutil/xtea.h
View File

@@ -23,6 +23,7 @@
#define AVUTIL_XTEA_H #define AVUTIL_XTEA_H
#include <stdint.h> #include <stdint.h>
#include "version.h"
/** /**
* @file * @file
@@ -32,9 +33,18 @@
* @{ * @{
*/ */
#if FF_API_CRYPTO_CONTEXT
typedef struct AVXTEA { typedef struct AVXTEA {
uint32_t key[16]; uint32_t key[16];
} AVXTEA; } AVXTEA;
#else
typedef struct AVXTEA AVXTEA;
#endif
/**
* Allocate an AVXTEA context.
*/
AVXTEA *av_xtea_alloc(void);
/** /**
* Initialize an AVXTEA context. * Initialize an AVXTEA context.