[FFmpeg-cvslog] Merge commit '34138ece23c8ddae543269212a051c00d49e67d7'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Dec 18 14:50:54 2015 +0100| [a38b50c3ff0b49cf4c04196ff889d35f105b50c8] | committer: Hendrik Leppkes

Merge commit '34138ece23c8ddae543269212a051c00d49e67d7'

* commit '34138ece23c8ddae543269212a051c00d49e67d7':
  log: Use a do {} while (0) for tlog

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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