Changeset 76d7676f in ffmpeg

Timestamp:

Mar 20, 2014, 7:52:19 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

75cc29a8

Parents:

8b66b43 (diff), 2539cf1c (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 '2539cf1c814190a017cb8986b41aa2f949e37fd9'

• commit '2539cf1c814190a017cb8986b41aa2f949e37fd9': hpeldsp_template: K&R formatting cosmetics

Conflicts:

libavcodec/hpeldsp_template.c

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

(No files)