(cherry picked from commit 566fe8b1e12e6f1442c51359b33f061b16327055)

Conflicts:

	modules/demux/oggseek.c
	modules/demux/stl.c