* commit 'a1e2c47c':
  libxvid: Return meaningful error messages

Conflicts:
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c

See: 2a89afb3 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>