[FFmpeg-cvslog] Merge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:38:24 2015 +0100| [d48d2f166d6543b930ffa486b780bf8b14d6554a] | committer: Michael Niedermayer

Merge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4

* commit '29e720da76ca353dbda9f881562902b41c355b77':
  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=d48d2f166d6543b930ffa486b780bf8b14d6554a
---