Changeset 7a28a9f6 in ffmpeg

Timestamp:

Sep 30, 2013, 12:15:36 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5c7d86cb

Parents:

c7fae908 (diff), 23d0fdcf (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 '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'

• commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3': Add support for multichannel ATRAC3+ streams.

Conflicts:

libavformat/oma.c

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

(No files)