Merge commit 'a686e58165ca0f83966431a9166cb6e17bf6095c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 10:28:25 +0000 (12:28 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 7 Sep 2015 10:28:25 +0000 (12:28 +0200)
* commit 'a686e58165ca0f83966431a9166cb6e17bf6095c':
  des: Add missing include

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavutil/des.h

diff --cc libavutil/des.h
Simple merge