Changeset 9a082fec in ffmpeg

Timestamp:

Feb 4, 2014, 3:14:30 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c93e6913

Parents:

c18cfd1 (diff), e46ad30a (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> (02/04/14 15:10:24)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/04/14 15:14:30)

Message:

Merge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'

• commit 'e46ad30a808744ddf3855567e162292a4eaabac7': vp8: use a fixed-size edge emu buffer

Conflicts:

libavcodec/vp8.c
libavcodec/vp8.h

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

(No files)