Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 15:13:38 +0000 (17:13 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 15:14:24 +0000 (17:14 +0200)
commiteaf15bba03b4067cb56b704ebc2e0b36a501ef22
tree876efe0baa8b03a560dcd611f6d0c72a0840cf85
parent6b9be608ce926ff2f858936e2aac4115400887cc
parentea4d46e72945cba37feb7aa154eb970732f513e4
Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'

* commit 'ea4d46e72945cba37feb7aa154eb970732f513e4':
  dds: Fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/dds.c