Changeset 98263d75 in ffmpeg

Timestamp:

Mar 30, 2015, 6:39:08 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

847c0d33

Parents:

f5c7531 (diff), 23944d29 (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/30/15 18:39:01)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/30/15 18:39:08)

Message:

Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'

• commit '23944d29a22a2cd602753b3705f73011c3bf0b18': indeo: Give Indeo4/5 shared code a more consistent name

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

(No files)