Changeset 1034fbdf in ffmpeg

Timestamp:

Mar 24, 2014, 2:11:08 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

15fe694e

Parents:

8de75f70 (diff), 15c5a8d2 (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 '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'

• commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7': mp3dec: export replaygain tags from ID3v2

Conflicts:

Changelog

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

(No files)