Changeset 83e89787 in ffmpeg

Timestamp:

Mar 24, 2014, 1:03:55 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c08e5235

Parents:

595ba3b9 (diff), 5a7e35d (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 '5a7e35dd2351c30bab45177b9482cb8833a0ca78'

• commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78': Add replaygain side data type and code for parsing replaygain tags.

Conflicts:

libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h

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

(No files)