[FFmpeg-cvslog] Merge commit 'eaa2d123f0a643664721593d248ece6bcd85f1e6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 23:30:33 2015 +0200| [954b5e340e8ea930f13a9ff2f3a7cbf7ccb3d989] | committer: Michael Niedermayer

Merge commit 'eaa2d123f0a643664721593d248ece6bcd85f1e6'

* commit 'eaa2d123f0a643664721593d248ece6bcd85f1e6':
  log: Print a full backtrace along with error messages under Valgrind

Conflicts:
	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=954b5e340e8ea930f13a9ff2f3a7cbf7ccb3d989
---