• 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
Name
Last commit
Last update
..
aac.mak Loading commit data...
ac3.mak Loading commit data...
acodec.mak Loading commit data...
adpcm.mak Loading commit data...
als.mak Loading commit data...
amrnb.mak Loading commit data...
amrwb.mak Loading commit data...
atrac.mak Loading commit data...
audio.mak Loading commit data...
bmp.mak Loading commit data...
cdxl.mak Loading commit data...
dct.mak Loading commit data...
demux.mak Loading commit data...
dfa.mak Loading commit data...
dpcm.mak Loading commit data...
ea.mak Loading commit data...
fft.mak Loading commit data...
h264.mak Loading commit data...
image.mak Loading commit data...
indeo.mak Loading commit data...
libavcodec.mak Loading commit data...
libavutil.mak Loading commit data...
lossless-audio.mak Loading commit data...
lossless-video.mak Loading commit data...
mapchan.mak Loading commit data...
microsoft.mak Loading commit data...
mp3.mak Loading commit data...
mpc.mak Loading commit data...
pcm.mak Loading commit data...
probe.mak Loading commit data...
prores.mak Loading commit data...
qt.mak Loading commit data...
qtrle.mak Loading commit data...
real.mak Loading commit data...
screen.mak Loading commit data...
utvideo.mak Loading commit data...
vcodec.mak Loading commit data...
video.mak Loading commit data...
voice.mak Loading commit data...
vorbis.mak Loading commit data...
vpx.mak Loading commit data...
vqf.mak Loading commit data...
wavpack.mak Loading commit data...
wma.mak Loading commit data...