Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 00:48:19 +0000 (02:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 00:48:19 +0000 (02:48 +0200)
commit8e8219e0f0725116809cdd1c17c868cb08da0dec
treeeccf6f91c9ff4d49aaa71727640934cec80fcfa0
parent93db2708d3b0bcc1f1d87d23ae8adbedd8ea6660
parentc253340ae6f74ffd8798bbd476e46d1b33a2d56e
Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'

* commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e':
  log: Introduce a more verbose debug level

Conflicts:
doc/APIchanges
doc/fftools-common-opts.texi
libavutil/log.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
doc/APIchanges
doc/fftools-common-opts.texi
libavutil/log.c
libavutil/log.h
libavutil/version.h