Changeset 75fbe41f in ffmpeg

Timestamp:

Jul 21, 2013, 9:45:48 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0a28a52d

Parents:

1f7acf3c (diff), fcae3ff1 (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 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'

• commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd': dsicinav: K&R formatting cosmetics

Conflicts:

libavcodec/dsicinav.c

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

(No files)