Merge commit '192ccc50'

* commit '192ccc50':
  build: The MPEG-4 video parser depends on h263dsp

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

configure

@@ -2136,7 +2136,7 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
 # parsers
 h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
 hevc_parser_select="hevc_decoder"
-mpeg4video_parser_select="error_resilience mpegvideo"
+mpeg4video_parser_select="error_resilience h263dsp mpegvideo"
 mpegvideo_parser_select="error_resilience mpegvideo"
 vc1_parser_select="mpegvideo"