Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:40:53 +0000 (19:40 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:40:53 +0000 (19:40 +0100)
commit4b23a8137fd38f06a07e3a679dc956b077e1cf2a
tree08b38f6ef28f8542ee7e21c3fdeb1a6e0908f451
parent8f540b86125a25ee48ea6da69139356063726b8e
parent52385410b7de012c2562fb5ba8f07a4e1112c4e7
Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavutil/des.c