Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 23:03:28 +0000 (01:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Apr 2014 23:17:15 +0000 (01:17 +0200)
commit26953ed2e39d7ffbe5125c901d665a5dddab45dd
tree217bd15537d2cb3baa5f701a1b4a249ab1a50df8
parent06e664366a66a373358aacacde8e86348d55bd22
parentcae8df78759c2e69257f7fe58842f34c0d98a7ec
Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec'

* commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec':
  lavr: define ResampleContext in resample.h

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