Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'

* commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563':
  vble: Do not abort decoding when version is not 1
  lavr: do not pass consumed samples as a parameter to ff_audio_resample()
  lavr: correct the documentation for the ff_audio_resample() return value
  lavr: do not pass sample count as a parameter to ff_audio_convert()
  x86: h264_weight: port to cpuflags
  configure: Enable avconv filter dependencies automatically

Conflicts:
	configure
	libavcodec/x86/h264_weight.asm

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

diff --cc libavcodec/x86/h264_weight.asm
index b23e804dcf5ee2b21dcc41b65bc791d422dd6926,646acdffe30b0f8c6f39d3b0a2fef8f178ad2b62..4759a063a61c872196cb042d194ee2b4c12420d5
--- 1/libavcodec/x86/h264_weight.asm
--- 2/libavcodec/x86/h264_weight.asm
+++ b/libavcodec/x86/h264_weight.asm
@@@ -135,8 -135,13 +135,20 @@@ WEIGHT_FUNC_HALF_MM 8, 
      add  off_regd, 1
      or   off_regd, 1
      add        r4, 1
++    cmp        r5, 128
++     jne .normal
++    sar        r5, 1
++    sar        r6, 1
++    sar  off_regd, 1
++    sub        r4, 1
++.normal
+ %if cpuflag(ssse3)
+     movd       m4, r5d
+     movd       m0, r6d
+ %else
      movd       m3, r5d
      movd       m4, r6d
+ %endif
      movd       m5, off_regd
      movd       m6, r4d
      pslld      m5, m6

diff --cc libavresample/utils.c
Simple merge