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)
* commit '6454c44f9f74dbaed17d32cf0eaec185386c27fa':
  rtmpproto: Fix limelight authentication with abbreviated app names

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

Simple merge