Commit c4a696fb authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'befe044b'

* commit 'befe044b':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2a27e525 befe044b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment