On 31/07/15 3:42 PM, Paul B Mahol wrote: > On 7/31/15, James Almer <jamr...@gmail.com> wrote: >> Signed-off-by: James Almer <jamr...@gmail.com> >> --- >> doc/APIchanges | 1 + >> libavutil/des.c | 13 ++++++++++++- >> libavutil/des.h | 24 ++++++++++++++++++++++-- >> 3 files changed, 35 insertions(+), 3 deletions(-) >> >> diff --git a/doc/APIchanges b/doc/APIchanges >> index 7d1984f..cce2ddb 100644 >> --- a/doc/APIchanges >> +++ b/doc/APIchanges >> @@ -19,6 +19,7 @@ API changes, most recent first: >> xxxxxxx - Add av_blowfish_alloc(). >> xxxxxxx - Add av_rc4_alloc(). >> xxxxxxx - Add av_xtea_alloc(). >> + xxxxxxx - Add av_des_alloc(). >> >> 2015-xx-xx - lavc 56.35.0 - avcodec.h >> xxxxxxxxx - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*. >> diff --git a/libavutil/des.c b/libavutil/des.c >> index 57ad0a4..e7e9178 100644 >> --- a/libavutil/des.c >> +++ b/libavutil/des.c >> @@ -22,9 +22,15 @@ >> #include "avutil.h" >> #include "common.h" >> #include "intreadwrite.h" >> +#include "mem.h" >> #include "des.h" >> >> -typedef struct AVDES AVDES; >> +#if !FF_API_CRYPTO_CONTEXT >> +struct AVDES { >> + uint64_t round_keys[3][16]; >> + int triple_des; >> +}; > > Here and in others, shouldn't this be: > > struct AVDES { > uint64_t round_keys[3][16]; > int triple_des; > } AVDES; > > ?
No, the struct is typedeffed in the header now. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel