Michael Niedermayer 74744790a3 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>

2014-02-12 14:41:24 +01:00

11 KiB

Raw Blame History

View Raw