[FFmpeg-cvslog] Merge commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 23 11:58:14 2013 +0100| [5b4c7b7dcf933ccbab407ac71a950f791c707da0] | committer: Michael Niedermayer

Merge commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877'

* commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877':
  doc: fix a coding style error in the developer documentation.

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

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