Changeset 774d0c9d in ffmpeg

Timestamp:

Mar 7, 2014, 11:44:09 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d540e757

Parents:

64e4bd74 (diff), 93d216d3 (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 '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'

• commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7': dict: K&R formatting cosmetics

Conflicts:

libavutil/dict.c

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

(No files)