[FFmpeg-cvslog] Merge commit 'c253340ae6f74ffd8798bbd476e46d1b33a2d56e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 02:48:19 2015 +0200| [8e8219e0f0725116809cdd1c17c868cb08da0dec] | committer: Michael Niedermayer

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

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