[FFmpeg-cvslog] Merge commit '25a1ba814ad80056247fd357ec4c6911324a3f66'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 12 14:41:24 2014 +0100| [74744790a366ed53cfafa2b0720c27b1eaef770a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=74744790a366ed53cfafa2b0720c27b1eaef770a
---