Changeset 74fed968 in ffmpeg

Timestamp:

Mar 22, 2014, 10:21:54 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9d6a27d5

Parents:

816d7936 (diff), 82dd1026 (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 '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

• commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f': x86: dsputil: Move hpeldsp-related declarations to a separate header

Conflicts:

libavcodec/x86/dsputil_x86.h

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

(No files)