• Michael Niedermayer's avatar
    Merge commit '29abb04e' · 741f5b02
    Michael Niedermayer authored
    * commit '29abb04e':
      libspeexdec: If the channel count is not valid, decode as stereo.
      libspeexdec: improve setting of Speex mode and sample rate
      libspeex: Add a private option for enabling VAD
      xtea: Test inplace decryption
      xtea: Fix CBC decryption when src==dst
      xtea: Factorize testing into a separate function
      configure: Refactor HAVE_ options available on the command line
      avconv/avprobe: Add missing 'void' to exit_program() definition
      Allow use of strncpy()
      blowfish: Add more tests
      blowfish: Fix CBC decryption with dst==src
      blowfish: Factorize testing into a separate function
    
    Conflicts:
    	configure
    	libavcodec/libspeexdec.c
    	libavutil/xtea.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    741f5b02
xtea.c 8.55 KB