Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 11:42:41 +0000 (13:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 11:43:07 +0000 (13:43 +0200)
commit5f9b1aae504fd6842b049866b0974f710e0bd3ca
treea44517fe5156c7920e77bec7497af6f9b1009eb6
parent8b79a458c084632ef5d911cb135c52db59b402ff
parent6454c44f9f74dbaed17d32cf0eaec185386c27fa
Merge commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa'

* commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa':
  rtmpproto: Fix limelight authentication with abbreviated app names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmpproto.c