• Michael Niedermayer's avatar
    Merge commit 'f5fa0366' · 26444171
    Michael Niedermayer authored
    * commit 'f5fa0366':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    26444171
h264_weight.asm 6.89 KB