[FFmpeg-cvslog] Merge commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  3 20:53:30 2014 +0200| [002feaf6e22c80f542d3155cf5af67ee5e945cc8] | committer: Michael Niedermayer

Merge commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6'

* commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6':
  log: Remove undefined behaviour

Conflicts:
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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