[FFmpeg-cvslog] Merge commit 'a28468d0daf4be14761c16a3ddd33266b2380123'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 18 02:55:23 2014 +0100| [7384ec19cf13fe204317c1b88333c58cbfa6336a] | committer: Michael Niedermayer

Merge commit 'a28468d0daf4be14761c16a3ddd33266b2380123'

* commit 'a28468d0daf4be14761c16a3ddd33266b2380123':
  librtmp: append the correct field to the string

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

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