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)
* commit '21d8f4da91673051ad7055cf63d989488a56368e':
  resample: remove an unneeded context variable

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

Simple merge