Merge commit '006c253346d90f4abaf69d78083c8ba031628598'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Apr 2014 17:16:45 +0000 (19:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Apr 2014 17:25:03 +0000 (19:25 +0200)
commit0768fee9649ad2c22dd0639030aa33b3127260ee
treec9a8c21899d8de1a76f1cdf9be61b6139b3a90b5
parent8c272923736861cccfae0befebf09760baf54bf1
parent006c253346d90f4abaf69d78083c8ba031628598
Merge commit '006c253346d90f4abaf69d78083c8ba031628598'

* commit '006c253346d90f4abaf69d78083c8ba031628598':
  doc: Fit the graph in 80 cols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/ffmpeg.texi