Changeset 0e85a28f in ffmpeg

Timestamp:

Nov 25, 2014, 11:15:01 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ba1a19b

Parents:

79f77ce3 (diff), 51946d2d (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> (11/25/14 11:14:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/25/14 11:15:01)

Message:

Merge commit '51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb'

• commit '51946d2de8bd4a4aada43b6ab41340b0f5eb4ecb': vc1: Use the correct shift amount

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

(No files)