Changeset 0b82fdcc in ffmpeg

Timestamp:

Nov 2, 2013, 9:19:12 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1344c045

Parents:

7146eacf (diff), 037fea38 (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 '037fea388e0df2a22441bc1ed86794152161baf1'

• commit '037fea388e0df2a22441bc1ed86794152161baf1': flashsv: K&R formatting cosmetics

Conflicts:

libavcodec/flashsv.c

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

(No files)