Changeset 9ef7c0c5 in ffmpeg

Timestamp:

Jan 8, 2014, 4:13:25 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3c00d4c5

Parents:

1c010fd0 (diff), 67bb3a4e (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 '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'

• commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f': arm: cosmetics: Reindent the h264dsp neon init function

Conflicts:

libavcodec/arm/h264dsp_init_arm.c

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

(No files)