Merge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jul 2014 10:35:55 +0000 (12:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 25 Jul 2014 10:39:17 +0000 (12:39 +0200)
commit937eaba2a1159225aeef694d9b2e72d9eff0c8da
tree9380f6ad7f4112236bc295d1daed74f20aff1549
parent04bc37007224cfab68bc557507c449fb661218e5
parent060e4a9e0627adcda9101dd68ec7f22b4ce22b5b
Merge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'

* commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b':
  dct/rdft: Remove duplicate typedefs for context structs

See: 005e81d6cff4071847fe6e6b6de3b5d709c76de9
See: 77304cf3523cbeec56a29749fea5c21e610be644
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/fft-test.c