• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · a1fc1d2e
    Michael Niedermayer authored
    * qatar/master:
      pcm-mpeg: improve log message wording
      fate: add missing $(TARGET_PATH) to ac3-fixed-encode
      fate: fix md5sum replacement on some systems
      avprobe: correctly set the default formatter
      lavr: add x86-optimized function for mixing 2 to 1 s16p with q8 coeffs
      lavr: add x86-optimized functions for mixing 2 to 1 s16p with float coeffs
      lavr: add C functions for mixing 2 to 1 channels with s16p format
      avprobe: move formatter functions in the context
    
    Conflicts:
    	ffprobe.c
    	libavcodec/pcm-mpeg.c
    	tests/fate/ac3.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    a1fc1d2e
ac3.mak 2.25 KB