Merge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:38:24 +0000 (02:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:38:34 +0000 (02:38 +0100)
commitd48d2f166d6543b930ffa486b780bf8b14d6554a
treea623139f5964050e2953daf0b17189a360812e69
parente82140b09b0f6ab7b64899bec12221dc582f1b95
parent29e720da76ca353dbda9f881562902b41c355b77
Merge commit '29e720da76ca353dbda9f881562902b41c355b77' into release/2.4

* commit '29e720da76ca353dbda9f881562902b41c355b77':
  librtmp: append the correct field to the string

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