Changeset 2ca48026 in ffmpeg

Timestamp:

Jun 22, 2014, 10:13:34 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

73827282

Parents:

c69f7299 (diff), 49470b94 (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 commit '49470b9404583ab3aff6835f78a759349d331696'

• commit '49470b9404583ab3aff6835f78a759349d331696': build: Add missing replaygain object file for CAF demuxer

Conflicts:

libavformat/Makefile

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)