Merge commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 19:45:40 +0000 (20:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 19:46:03 +0000 (20:46 +0100)
commit996fdca8fbc10074e3b55cfa5c9eb346d324c29d
tree480b039d47efe9d1e7d8738a4068a96fcc61b78a
parent0a4311dee55b3ac56282505f3f6fbbb63b8a7be1
parenta46dc49744bdc4f2e31725b63ac8e41f701e4fa1
Merge commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1'

* commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1':
  rpza: move some variables to the blocks where they are used

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