RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7' 

* commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7':
  des-test: Move a variable declaration to avoid an ifdef

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-17 19:40:53 +01:00
parent 8f540b8612 52385410b7
commit 4b23a8137f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/des.c
View File

@ -389,9 +389,6 @@ static int run_test(int cbc, int decrypt) {
int main(void) {
AVDES d;
int i;
#ifdef GENTABLES
int j;
#endif
uint64_t key[3];
uint64_t data;
uint64_t ct;
@ -429,6 +426,7 @@ int main(void) {
#ifdef GENTABLES
printf("static const uint32_t S_boxes_P_shuffle[8][64] = {\n");
for (i = 0; i < 8; i++) {
int j;
printf(" {");
for (j = 0; j < 64; j++) {
uint32_t v = S_boxes[i][j >> 1];