Changeset 03963063 in ffmpeg

Timestamp:
May 3, 2014, 9:29:20 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
1c4110be
Parents:
0c06ca7a (diff), 925c3787 (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 '925c37874b617816b6f460c6f229c18b46548b46'

Conflicts:

libavcodec/vp9.c

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

(No files)

Note: See TracChangeset for help on using the changeset viewer.