Changeset b7f0d39d in ffmpeg

Timestamp:

Mar 26, 2014, 2:53:33 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4998a72b

Parents:

a49bdcd (diff), 55d7f26e (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 '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'

• commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6': hpeldsp_template: Move content to hpeldsp

Conflicts:

libavcodec/hpeldsp_template.c

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

(No files)