Changeset 2d15e0c0 in ffmpeg

Timestamp:

Mar 26, 2014, 2:36:27 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a49bdcd

Parents:

b4f64c5 (diff), 92ba9651 (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 '92ba965103d3884609730ba9bf293772dc78a9ef'

• commit '92ba965103d3884609730ba9bf293772dc78a9ef': dsputil: Move draw_edges and clear_block* out of dsputil_template

Conflicts:

libavcodec/dsputil.c

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

(No files)