Merge commit '25a1ba814ad80056247fd357ec4c6911324a3f66'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 13:41:24 +0000 (14:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 13:41:24 +0000 (14:41 +0100)
commit74744790a366ed53cfafa2b0720c27b1eaef770a
tree0f9c54c49bb63764ce3474117bdf6af043bbcd56
parentbb6b1731eba2fac424ff8ad3003fe58b308debd1
parent25a1ba814ad80056247fd357ec4c6911324a3f66
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>
libavutil/log.c
libavutil/log.h