(cherry picked from commit 45032ec3b271641aaa3d9613e7c579fabc3d475a)

Conflicts:
	modules/codec/avcodec/audio.c