Merge commit '096a1d5b46391f65dfd0bee6292e9962f53bd7c8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 17:15:52 +0000 (19:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Sep 2014 17:16:15 +0000 (19:16 +0200)
commit73aeb27cfe4ec51c2577097c980fe126dcd1908b
tree7d6f33b151752c193455ae96c3f5a51a2dc1018a
parent8c6cfffa01b27afde8bb983c6421611e07688aa6
parent096a1d5b46391f65dfd0bee6292e9962f53bd7c8
Merge commit '096a1d5b46391f65dfd0bee6292e9962f53bd7c8'

* commit '096a1d5b46391f65dfd0bee6292e9962f53bd7c8':
  rdft: Move some variables into a separate block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rdft.c