Changeset fb8a10db in ffmpeg

Timestamp:

Oct 14, 2013, 12:04:38 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d794b7db

Parents:

5970f4bb (diff), 14ddbb47 (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 '14ddbb477faef359983151b763fd8b20e578651b'

• commit '14ddbb477faef359983151b763fd8b20e578651b': cavs: K&R formatting cosmetics

Conflicts:

libavcodec/cavs.c

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

(No files)