Merge commit '84dfc426cea7242099aea9d47121cea65dffd936'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:27:42 +0000 (15:27 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 13:27:42 +0000 (15:27 +0200)
commit24fea89983756fcd9bfee475581a7b049b3ad8ee
treec35881875efd3a881569a28cd137777e4cfb9710
parentfe294b34030becfa58001dffaff0311b19e60526
parent84dfc426cea7242099aea9d47121cea65dffd936
Merge commit '84dfc426cea7242099aea9d47121cea65dffd936'

* commit '84dfc426cea7242099aea9d47121cea65dffd936':
  avresample: Remove an unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>