[FFmpeg-cvslog] Merge commit '0d671ade99059fd47b155df85c10c35eb6d54878'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  9 04:40:39 2014 +0200| [43935842bd1307b084a32ea40d2ed6c8733e034a] | committer: Michael Niedermayer

Merge commit '0d671ade99059fd47b155df85c10c35eb6d54878'

* commit '0d671ade99059fd47b155df85c10c35eb6d54878':
  doc: Use a 3 columns multitable

Conflicts:
	doc/encoders.texi

No change as we dont use a multitable for this list
we could of course switch to one though if it looks better
comments welcome

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

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