Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:33:49 +0000 (11:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:37:57 +0000 (11:37 +0200)
commit5993b962691ae29b6563785d26ef2a19ffa97f4c
tree33e8dc6047626e995914cf5482099e9a7e27fbdb
parent159dfd26259dbfc6b221447c24ea14f0a659f6a0
parentd175a5730b42166704b7262b33f4b780d9d92f60
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@gmx.at>
doc/protocols.texi