Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:20:56 +0000 (00:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 23:20:56 +0000 (00:20 +0100)
* commit 'fb7127b2c836b53ad5168887cd12871312c8708d':
  build: h264 parser depends on full h264 decoder

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile

diff --cc configure
+++ b/configure
@@@ -2205,8 -1908,7 +2205,8 @@@ wmv3_vdpau_decoder_select="vc1_vdpau_de
  wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
  
  # parsers
- h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
+ h264_parser_select="h264_decoder"
 +hevc_parser_select="hevc_decoder"
  mpeg4video_parser_select="error_resilience h263dsp mpegvideo"
  mpegvideo_parser_select="error_resilience mpegvideo"
  vc1_parser_select="mpegvideo"
Simple merge