Changeset 97a407f in ffmpeg

Timestamp:

Mar 29, 2015, 10:24:33 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

93704e09

Parents:

268ff17c (diff), 6fe2641d (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/29/15 10:21:24)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/29/15 10:24:33)

Message:

Merge commit '6fe2641d6e410b7bc203138fa97e1118b411f16d'

• commit '6fe2641d6e410b7bc203138fa97e1118b411f16d': lavc: add profile define for DTS Express

Conflicts:

doc/APIchanges
libavcodec/version.h

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

(No files)