Merge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 11:17:12 +0000 (13:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 11:17:12 +0000 (13:17 +0200)
* commit 'befe044bb9561c9d7d6559db06bba375e82a4b66':
  avcodec: Stop exporting the removed audio_resample* symbols

Conflicts:
libavcodec/libavcodec.v

Not merged as theres no pressing need to remove it now.

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

Trivial merge