Changeset a87188eb in ffmpeg

Timestamp:

Mar 20, 2014, 8:58:16 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ba85bfab

Parents:

b20b7724 (diff), cf7a2167 (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 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e'

• commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e': arm: dsputil: K&R formatting cosmetics

Conflicts:

libavcodec/arm/dsputil_init_arm.c

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

(No files)