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)
* commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec':
  lavr: define ResampleContext in resample.h

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

Simple merge
Simple merge