Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
Add h263dsp dependency to mpeg1video and mpeg2video encoders.

Fixes compilation with:
configure --disable-everything --enable-encoder=mpeg2video --disable-asm
Avoid a possible overflow when reading Nikon avi files.

Suggested-by: Reimar
lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width().

Conflicts:
	doc/APIchanges
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a possible overflow when reading Nikon avi files.
  Add h263dsp dependency to mpeg1video and mpeg2video encoders.
  Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc

Merged-by: Michael Niedermayer <michaelni@gmx.at>