(cherry picked from commit fb4754ad766a93452068416a5c9eca5b1bd632b4)

Conflicts:

	modules/demux/avi/libavi.c