Merge commit '0d3784396b736374a61fea26268febdabd803a59'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 08:50:49 +0000 (10:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Sep 2013 08:50:54 +0000 (10:50 +0200)
* commit '0d3784396b736374a61fea26268febdabd803a59':
  rtmpproto: Check for the right return code

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

Simple merge