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)
commitc4a696fb546576759467358d5258268a30aaa4d3
tree1dbda94e03f632ad22be3fef1bcac29aeb1cb446
parent2a27e5255071e2bac7f78f484c528d0810be73a0
parentbefe044bb9561c9d7d6559db06bba375e82a4b66
Merge commit 'befe044bb9561c9d7d6559db06bba375e82a4b66'

* 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>