Changeset a1fc1d2e in ffmpeg

Timestamp:

May 30, 2012, 5:32:06 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

76853a3

Parents:

39f0a45a (diff), d041dec3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'qatar/master'

• 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: Michael Niedermayer <​michaelni@gmx.at>

(No files)