[FFmpeg-cvslog] Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 11 11:33:49 2013 +0200| [5993b962691ae29b6563785d26ef2a19ffa97f4c] | committer: Michael Niedermayer

Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'

* commit 'd175a5730b42166704b7262b33f4b780d9d92f60':
  doc: Add an example on publishing over RTMP
  doc: Add librtmp to the section header for the librtmp specific details

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

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