Changeset a00d4c59 in ffmpeg

Timestamp:

Mar 17, 2014, 2:29:42 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3731c409

Parents:

b361a0bf (diff), c598b569 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/17/14 14:24:05)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/17/14 14:29:42)

Message:

Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'

• commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186': png: K&R formatting cosmetics

Conflicts:

libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c

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

(No files)