Changeset ea0931fb in ffmpeg

Timestamp:

May 29, 2014, 10:01:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c814a6c7

Parents:

cb8763bd (diff), 65d5d586 (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 '65d5d5865845f057cc6530a8d0f34db952d9009c'

• commit '65d5d5865845f057cc6530a8d0f34db952d9009c': dsputil: Move SVQ1 encoding specific bits into svq1enc

Conflicts:

libavcodec/x86/Makefile

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

(No files)