[FFmpeg-cvslog] Merge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 25 12:35:55 2014 +0200| [937eaba2a1159225aeef694d9b2e72d9eff0c8da] | committer: Michael Niedermayer

Merge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'

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

See: 005e81d6cff4071847fe6e6b6de3b5d709c76de9
See: 77304cf3523cbeec56a29749fea5c21e610be644
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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