Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 19:07:21 +0000 (21:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 19:07:25 +0000 (21:07 +0200)
commit11d187b377be54de23f609592ce0f32d51ed9e6d
tree15e5a6e0eb065a2eebfe5b0513ed458f873c6510
parenta3bd33af9edd71a8eb22b706b611661a096779ac
parent21d8f4da91673051ad7055cf63d989488a56368e
Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'

* commit '21d8f4da91673051ad7055cf63d989488a56368e':
  resample: remove an unneeded context variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavresample/resample.c