Changeset b666e81c in ffmpeg

Timestamp:

May 28, 2015, 8:12:41 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e2f3ea1c

Parents:

7026d8a (diff), e461030 (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> (05/28/15 20:11:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/28/15 20:12:41)

Message:

Merge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'

• commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd': x86: cavs: Remove an unneeded scratch buffer

Conflicts:

libavcodec/x86/cavsdsp.c

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

(No files)