Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'

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

Conflicts:
	configure

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

diff --cc configure
index 71b30a4760f38590c8d3e5171f6e35702469d81d,07fa54d28263be1e12d61b1048e0a032002d9a46..8d1c09380b435908e39aa28a9238f9a92073b088
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2135,8 -1845,7 +2135,8 @@@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hw
  
  # parsers
  h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
- mpeg4video_parser_select="error_resilience mpegvideo"
 +hevc_parser_select="hevc_decoder"
+ mpeg4video_parser_select="error_resilience h263dsp mpegvideo"
  mpegvideo_parser_select="error_resilience mpegvideo"
  vc1_parser_select="mpegvideo"