Changeset 74744790 in ffmpeg

Timestamp:

Feb 12, 2014, 1:41:24 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

1bc3f1b7

Parents:

bb6b173 (diff), 25a1ba81 (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 '25a1ba814ad80056247fd357ec4c6911324a3f66'

• commit '25a1ba814ad80056247fd357ec4c6911324a3f66': log: Have function parameter names match between .c and .h file

Conflicts:

libavutil/log.c

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

(No files)