[FFmpeg-cvslog] Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 25 01:03:28 2014 +0200| [26953ed2e39d7ffbe5125c901d665a5dddab45dd] | committer: Michael Niedermayer

Merge commit 'cae8df78759c2e69257f7fe58842f34c0d98a7ec'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26953ed2e39d7ffbe5125c901d665a5dddab45dd
---