[FFmpeg-cvslog] Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 17 19:40:53 2016 +0100| [4b23a8137fd38f06a07e3a679dc956b077e1cf2a] | committer: Derek Buitenhuis

Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b23a8137fd38f06a07e3a679dc956b077e1cf2a
---

 libavutil/des.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavutil/des.c b/libavutil/des.c
index 3ccbf89..7198076 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -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];


======================================================================